diff --git a/pkg/spxrpc/stubs.go b/pkg/spxrpc/stubs.go
index d96dd1a1..b402e7e0 100644
--- a/pkg/spxrpc/stubs.go
+++ b/pkg/spxrpc/stubs.go
@@ -286,13 +286,13 @@ func (s *Server) HandlePlaceStreamBrandingDeleteBlob(c echo.Context) error {
 	ctx, span := otel.Tracer("server").Start(c.Request().Context(), "HandlePlaceStreamBrandingDeleteBlob")
 	defer span.End()
 
-	var body placestreamtypes.BrandingDeleteBlob_Input
+	var body placestream.BrandingDeleteBlob_Input
 	if err := c.Bind(&body); err != nil {
 		return err
 	}
-	var out *placestreamtypes.BrandingDeleteBlob_Output
+	var out *placestream.BrandingDeleteBlob_Output
 	var handleErr error
-	// func (s *Server) handlePlaceStreamBrandingDeleteBlob(ctx context.Context,body *placestreamtypes.BrandingDeleteBlob_Input) (*placestreamtypes.BrandingDeleteBlob_Output, error)
+	// func (s *Server) handlePlaceStreamBrandingDeleteBlob(ctx context.Context,body *placestream.BrandingDeleteBlob_Input) (*placestream.BrandingDeleteBlob_Output, error)
 	out, handleErr = s.handlePlaceStreamBrandingDeleteBlob(ctx, &body)
 	if handleErr != nil {
 		return handleErr
@@ -319,9 +319,9 @@ func (s *Server) HandlePlaceStreamBrandingGetBranding(c echo.Context) error {
 	ctx, span := otel.Tracer("server").Start(c.Request().Context(), "HandlePlaceStreamBrandingGetBranding")
 	defer span.End()
 	broadcaster := c.QueryParam("broadcaster")
-	var out *placestreamtypes.BrandingGetBranding_Output
+	var out *placestream.BrandingGetBranding_Output
 	var handleErr error
-	// func (s *Server) handlePlaceStreamBrandingGetBranding(ctx context.Context,broadcaster string) (*placestreamtypes.BrandingGetBranding_Output, error)
+	// func (s *Server) handlePlaceStreamBrandingGetBranding(ctx context.Context,broadcaster string) (*placestream.BrandingGetBranding_Output, error)
 	out, handleErr = s.handlePlaceStreamBrandingGetBranding(ctx, broadcaster)
 	if handleErr != nil {
 		return handleErr
@@ -333,13 +333,13 @@ func (s *Server) HandlePlaceStreamBrandingUpdateBlob(c echo.Context) error {
 	ctx, span := otel.Tracer("server").Start(c.Request().Context(), "HandlePlaceStreamBrandingUpdateBlob")
 	defer span.End()
 
-	var body placestreamtypes.BrandingUpdateBlob_Input
+	var body placestream.BrandingUpdateBlob_Input
 	if err := c.Bind(&body); err != nil {
 		return err
 	}
-	var out *placestreamtypes.BrandingUpdateBlob_Output
+	var out *placestream.BrandingUpdateBlob_Output
 	var handleErr error
-	// func (s *Server) handlePlaceStreamBrandingUpdateBlob(ctx context.Context,body *placestreamtypes.BrandingUpdateBlob_Input) (*placestreamtypes.BrandingUpdateBlob_Output, error)
+	// func (s *Server) handlePlaceStreamBrandingUpdateBlob(ctx context.Context,body *placestream.BrandingUpdateBlob_Input) (*placestream.BrandingUpdateBlob_Output, error)
 	out, handleErr = s.handlePlaceStreamBrandingUpdateBlob(ctx, &body)
 	if handleErr != nil {
 		return handleErr
diff --git a/pkg/streamplace/brandingdeleteBlob.go b/pkg/streamplace/brandingdeleteBlob.go
index 0e5f7f28..60dcc0b4 100644
--- a/pkg/streamplace/brandingdeleteBlob.go
+++ b/pkg/streamplace/brandingdeleteBlob.go
@@ -1,13 +1,13 @@
 // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT.
 
-package streamplace
+// Lexicon schema: place.stream.branding.deleteBlob
 
-// schema: place.stream.branding.deleteBlob
+package streamplace
 
 import (
 	"context"
 
-	"github.com/bluesky-social/indigo/lex/util"
+	lexutil "github.com/bluesky-social/indigo/lex/util"
 )
 
 // BrandingDeleteBlob_Input is the input argument to a place.stream.branding.deleteBlob call.
@@ -24,9 +24,9 @@ type BrandingDeleteBlob_Output struct {
 }
 
 // BrandingDeleteBlob calls the XRPC method "place.stream.branding.deleteBlob".
-func BrandingDeleteBlob(ctx context.Context, c util.LexClient, input *BrandingDeleteBlob_Input) (*BrandingDeleteBlob_Output, error) {
+func BrandingDeleteBlob(ctx context.Context, c lexutil.LexClient, input *BrandingDeleteBlob_Input) (*BrandingDeleteBlob_Output, error) {
 	var out BrandingDeleteBlob_Output
-	if err := c.LexDo(ctx, util.Procedure, "application/json", "place.stream.branding.deleteBlob", nil, input, &out); err != nil {
+	if err := c.LexDo(ctx, lexutil.Procedure, "application/json", "place.stream.branding.deleteBlob", nil, input, &out); err != nil {
 		return nil, err
 	}
 
diff --git a/pkg/streamplace/brandinggetBlob.go b/pkg/streamplace/brandinggetBlob.go
index c3dba789..e66fed2c 100644
--- a/pkg/streamplace/brandinggetBlob.go
+++ b/pkg/streamplace/brandinggetBlob.go
@@ -1,21 +1,21 @@
 // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT.
 
-package streamplace
+// Lexicon schema: place.stream.branding.getBlob
 
-// schema: place.stream.branding.getBlob
+package streamplace
 
 import (
 	"bytes"
 	"context"
 
-	"github.com/bluesky-social/indigo/lex/util"
+	lexutil "github.com/bluesky-social/indigo/lex/util"
 )
 
 // BrandingGetBlob calls the XRPC method "place.stream.branding.getBlob".
 //
 // broadcaster: DID of the broadcaster. If not provided, uses the server's default broadcaster.
 // key: Branding asset key (mainLogo, favicon, siteTitle, etc.)
-func BrandingGetBlob(ctx context.Context, c util.LexClient, broadcaster string, key string) ([]byte, error) {
+func BrandingGetBlob(ctx context.Context, c lexutil.LexClient, broadcaster string, key string) ([]byte, error) {
 	buf := new(bytes.Buffer)
 
 	params := map[string]interface{}{}
@@ -23,7 +23,7 @@ func BrandingGetBlob(ctx context.Context, c util.LexClient, broadcaster string,
 		params["broadcaster"] = broadcaster
 	}
 	params["key"] = key
-	if err := c.LexDo(ctx, util.Query, "", "place.stream.branding.getBlob", params, nil, buf); err != nil {
+	if err := c.LexDo(ctx, lexutil.Query, "", "place.stream.branding.getBlob", params, nil, buf); err != nil {
 		return nil, err
 	}
 
diff --git a/pkg/streamplace/brandinggetBranding.go b/pkg/streamplace/brandinggetBranding.go
index 44518aca..0a37c951 100644
--- a/pkg/streamplace/brandinggetBranding.go
+++ b/pkg/streamplace/brandinggetBranding.go
@@ -1,13 +1,13 @@
 // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT.
 
-package streamplace
+// Lexicon schema: place.stream.branding.getBranding
 
-// schema: place.stream.branding.getBranding
+package streamplace
 
 import (
 	"context"
 
-	"github.com/bluesky-social/indigo/lex/util"
+	lexutil "github.com/bluesky-social/indigo/lex/util"
 )
 
 // BrandingGetBranding_BrandingAsset is a "brandingAsset" in the place.stream.branding.getBranding schema.
@@ -35,14 +35,14 @@ type BrandingGetBranding_Output struct {
 // BrandingGetBranding calls the XRPC method "place.stream.branding.getBranding".
 //
 // broadcaster: DID of the broadcaster. If not provided, uses the server's default broadcaster.
-func BrandingGetBranding(ctx context.Context, c util.LexClient, broadcaster string) (*BrandingGetBranding_Output, error) {
+func BrandingGetBranding(ctx context.Context, c lexutil.LexClient, broadcaster string) (*BrandingGetBranding_Output, error) {
 	var out BrandingGetBranding_Output
 
 	params := map[string]interface{}{}
 	if broadcaster != "" {
 		params["broadcaster"] = broadcaster
 	}
-	if err := c.LexDo(ctx, util.Query, "", "place.stream.branding.getBranding", params, nil, &out); err != nil {
+	if err := c.LexDo(ctx, lexutil.Query, "", "place.stream.branding.getBranding", params, nil, &out); err != nil {
 		return nil, err
 	}
 
diff --git a/pkg/streamplace/brandingupdateBlob.go b/pkg/streamplace/brandingupdateBlob.go
index 3041d24c..7365865e 100644
--- a/pkg/streamplace/brandingupdateBlob.go
+++ b/pkg/streamplace/brandingupdateBlob.go
@@ -1,13 +1,13 @@
 // Code generated by cmd/lexgen (see Makefile's lexgen); DO NOT EDIT.
 
-package streamplace
+// Lexicon schema: place.stream.branding.updateBlob
 
-// schema: place.stream.branding.updateBlob
+package streamplace
 
 import (
 	"context"
 
-	"github.com/bluesky-social/indigo/lex/util"
+	lexutil "github.com/bluesky-social/indigo/lex/util"
 )
 
 // BrandingUpdateBlob_Input is the input argument to a place.stream.branding.updateBlob call.
@@ -32,9 +32,9 @@ type BrandingUpdateBlob_Output struct {
 }
 
 // BrandingUpdateBlob calls the XRPC method "place.stream.branding.updateBlob".
-func BrandingUpdateBlob(ctx context.Context, c util.LexClient, input *BrandingUpdateBlob_Input) (*BrandingUpdateBlob_Output, error) {
+func BrandingUpdateBlob(ctx context.Context, c lexutil.LexClient, input *BrandingUpdateBlob_Input) (*BrandingUpdateBlob_Output, error) {
 	var out BrandingUpdateBlob_Output
-	if err := c.LexDo(ctx, util.Procedure, "application/json", "place.stream.branding.updateBlob", nil, input, &out); err != nil {
+	if err := c.LexDo(ctx, lexutil.Procedure, "application/json", "place.stream.branding.updateBlob", nil, input, &out); err != nil {
 		return nil, err
 	}