diff --git a/lib/core/cache/poptart_cache_codecs.dart b/lib/core/cache/poptart_cache_codecs.dart
index 5b7756c..4e4c5ae 100644
--- a/lib/core/cache/poptart_cache_codecs.dart
+++ b/lib/core/cache/poptart_cache_codecs.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/labeler/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/defs.dart';
 
 class JsonStringCacheCodec<T> {
   const JsonStringCacheCodec({required this.encode, required this.decode});
diff --git a/lib/core/network/poptart_client_adapter.dart b/lib/core/network/poptart_client_adapter.dart
index e214f8e..2122c93 100644
--- a/lib/core/network/poptart_client_adapter.dart
+++ b/lib/core/network/poptart_client_adapter.dart
@@ -3,76 +3,76 @@ import 'dart:typed_data';
 
 import 'package:lazurite/shared/utils/atproto_datetime.dart';
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/get_preferences.dart';
-import 'package:poptart_lex/app/bsky/actor/get_profile.dart';
-import 'package:poptart_lex/app/bsky/actor/get_profiles.dart';
-import 'package:poptart_lex/app/bsky/actor/put_preferences.dart';
-import 'package:poptart_lex/app/bsky/actor/search_actors.dart';
-import 'package:poptart_lex/app/bsky/actor/search_actors_typeahead.dart';
-import 'package:poptart_lex/app/bsky/bookmark/create_bookmark.dart';
-import 'package:poptart_lex/app/bsky/bookmark/delete_bookmark.dart';
-import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart';
-import 'package:poptart_lex/app/bsky/feed/get_actor_likes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_author_feed.dart';
-import 'package:poptart_lex/app/bsky/feed/get_feed.dart';
-import 'package:poptart_lex/app/bsky/feed/get_feed_generator.dart';
-import 'package:poptart_lex/app/bsky/feed/get_feed_generators.dart';
-import 'package:poptart_lex/app/bsky/feed/get_likes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_list_feed.dart';
-import 'package:poptart_lex/app/bsky/feed/get_post_thread.dart';
-import 'package:poptart_lex/app/bsky/feed/get_posts.dart';
-import 'package:poptart_lex/app/bsky/feed/get_quotes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart';
-import 'package:poptart_lex/app/bsky/feed/get_suggested_feeds.dart';
-import 'package:poptart_lex/app/bsky/feed/get_timeline.dart';
-import 'package:poptart_lex/app/bsky/feed/like.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
-import 'package:poptart_lex/app/bsky/feed/repost.dart';
-import 'package:poptart_lex/app/bsky/feed/search_posts.dart';
-import 'package:poptart_lex/app/bsky/graph/block.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/follow.dart';
-import 'package:poptart_lex/app/bsky/graph/get_actor_starter_packs.dart';
-import 'package:poptart_lex/app/bsky/graph/get_followers.dart';
-import 'package:poptart_lex/app/bsky/graph/get_follows.dart';
-import 'package:poptart_lex/app/bsky/graph/get_list.dart';
-import 'package:poptart_lex/app/bsky/graph/get_lists.dart';
-import 'package:poptart_lex/app/bsky/graph/get_lists_with_membership.dart';
-import 'package:poptart_lex/app/bsky/graph/get_starter_pack.dart';
-import 'package:poptart_lex/app/bsky/graph/get_suggested_follows_by_actor.dart';
-import 'package:poptart_lex/app/bsky/graph/list.dart';
-import 'package:poptart_lex/app/bsky/graph/listblock.dart';
-import 'package:poptart_lex/app/bsky/graph/listitem.dart';
-import 'package:poptart_lex/app/bsky/graph/mute_actor.dart';
-import 'package:poptart_lex/app/bsky/graph/mute_actor_list.dart';
-import 'package:poptart_lex/app/bsky/graph/search_starter_packs.dart';
-import 'package:poptart_lex/app/bsky/graph/starterpack.dart';
-import 'package:poptart_lex/app/bsky/graph/unmute_actor.dart';
-import 'package:poptart_lex/app/bsky/graph/unmute_actor_list.dart';
-import 'package:poptart_lex/app/bsky/labeler/get_services.dart';
-import 'package:poptart_lex/app/bsky/notification/get_unread_count.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart';
-import 'package:poptart_lex/app/bsky/notification/register_push.dart';
-import 'package:poptart_lex/app/bsky/notification/unregister_push.dart';
-import 'package:poptart_lex/app/bsky/notification/update_seen.dart';
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
-import 'package:poptart_lex/app/bsky/unspecced/get_popular_feed_generators.dart';
-import 'package:poptart_lex/app/bsky/unspecced/get_trending_topics.dart';
-import 'package:poptart_lex/app/bsky/unspecced/get_trends.dart';
-import 'package:poptart_lex/app/bsky/video/defs.dart';
-import 'package:poptart_lex/app/bsky/video/get_job_status.dart';
-import 'package:poptart_lex/app/bsky/video/get_upload_limits.dart';
-import 'package:poptart_lex/app/bsky/video/upload_video.dart';
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
-import 'package:poptart_lex/chat/bsky/convo/delete_message_for_self.dart';
-import 'package:poptart_lex/chat/bsky/convo/get_convo_for_members.dart';
-import 'package:poptart_lex/chat/bsky/convo/get_messages.dart';
-import 'package:poptart_lex/chat/bsky/convo/list_convos.dart';
-import 'package:poptart_lex/chat/bsky/convo/mute_convo.dart';
-import 'package:poptart_lex/chat/bsky/convo/send_message.dart';
-import 'package:poptart_lex/chat/bsky/convo/unmute_convo.dart';
-import 'package:poptart_lex/chat/bsky/convo/update_read.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/get_preferences.dart';
+import 'package:bluesky_poptart/app/bsky/actor/get_profile.dart';
+import 'package:bluesky_poptart/app/bsky/actor/get_profiles.dart';
+import 'package:bluesky_poptart/app/bsky/actor/put_preferences.dart';
+import 'package:bluesky_poptart/app/bsky/actor/search_actors.dart';
+import 'package:bluesky_poptart/app/bsky/actor/search_actors_typeahead.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/create_bookmark.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/delete_bookmark.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/get_bookmarks.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_actor_likes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_author_feed.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_feed.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_feed_generator.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_feed_generators.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_likes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_list_feed.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_post_thread.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_posts.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_quotes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_reposted_by.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_suggested_feeds.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_timeline.dart';
+import 'package:bluesky_poptart/app/bsky/feed/like.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/feed/repost.dart';
+import 'package:bluesky_poptart/app/bsky/feed/search_posts.dart';
+import 'package:bluesky_poptart/app/bsky/graph/block.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/follow.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_actor_starter_packs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_followers.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_follows.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_list.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_lists.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_lists_with_membership.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_starter_pack.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_suggested_follows_by_actor.dart';
+import 'package:bluesky_poptart/app/bsky/graph/list.dart';
+import 'package:bluesky_poptart/app/bsky/graph/listblock.dart';
+import 'package:bluesky_poptart/app/bsky/graph/listitem.dart';
+import 'package:bluesky_poptart/app/bsky/graph/mute_actor.dart';
+import 'package:bluesky_poptart/app/bsky/graph/mute_actor_list.dart';
+import 'package:bluesky_poptart/app/bsky/graph/search_starter_packs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/starterpack.dart';
+import 'package:bluesky_poptart/app/bsky/graph/unmute_actor.dart';
+import 'package:bluesky_poptart/app/bsky/graph/unmute_actor_list.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/get_services.dart';
+import 'package:bluesky_poptart/app/bsky/notification/get_unread_count.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart';
+import 'package:bluesky_poptart/app/bsky/notification/register_push.dart';
+import 'package:bluesky_poptart/app/bsky/notification/unregister_push.dart';
+import 'package:bluesky_poptart/app/bsky/notification/update_seen.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/unspecced/get_popular_feed_generators.dart';
+import 'package:bluesky_poptart/app/bsky/unspecced/get_trending_topics.dart';
+import 'package:bluesky_poptart/app/bsky/unspecced/get_trends.dart';
+import 'package:bluesky_poptart/app/bsky/video/defs.dart';
+import 'package:bluesky_poptart/app/bsky/video/get_job_status.dart';
+import 'package:bluesky_poptart/app/bsky/video/get_upload_limits.dart';
+import 'package:bluesky_poptart/app/bsky/video/upload_video.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/delete_message_for_self.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/get_convo_for_members.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/get_messages.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/list_convos.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/mute_convo.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/send_message.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/unmute_convo.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/update_read.dart';
 import 'package:poptart_lex/com/atproto/identity/resolve_handle.dart';
 import 'package:poptart_lex/com/atproto/moderation/create_report.dart';
 import 'package:poptart_lex/com/atproto/moderation/defs.dart';
diff --git a/lib/core/scheduler/post_scheduler.dart b/lib/core/scheduler/post_scheduler.dart
index 8066192..b94e56c 100644
--- a/lib/core/scheduler/post_scheduler.dart
+++ b/lib/core/scheduler/post_scheduler.dart
@@ -2,12 +2,12 @@ import 'dart:io';
 import 'dart:typed_data';
 
 import 'package:poptart_core/poptart_core.dart' show AtUri, Blob;
-import 'package:poptart_lex/app/bsky/embed/defs.dart' as embed_defs;
-import 'package:poptart_lex/app/bsky/embed/images.dart';
-import 'package:poptart_lex/app/bsky/embed/video.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
-import 'package:poptart_lex/app/bsky/video/defs.dart';
+import 'package:bluesky_poptart/app/bsky/embed/defs.dart' as embed_defs;
+import 'package:bluesky_poptart/app/bsky/embed/images.dart';
+import 'package:bluesky_poptart/app/bsky/embed/video.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/video/defs.dart';
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:poptart_bluesky_text/poptart_bluesky_text.dart';
 import 'package:flutter/widgets.dart';
diff --git a/lib/features/alerts/presentation/alerts_screen.dart b/lib/features/alerts/presentation/alerts_screen.dart
index 49c3866..f01f934 100644
--- a/lib/features/alerts/presentation/alerts_screen.dart
+++ b/lib/features/alerts/presentation/alerts_screen.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/compose/bloc/compose_bloc.dart b/lib/features/compose/bloc/compose_bloc.dart
index 77c9fe1..1653bd8 100644
--- a/lib/features/compose/bloc/compose_bloc.dart
+++ b/lib/features/compose/bloc/compose_bloc.dart
@@ -2,15 +2,15 @@ import 'dart:async';
 import 'dart:io';
 import 'dart:ui' as ui;
 
-import 'package:poptart_lex/app/bsky/embed/defs.dart' as embed_defs;
-import 'package:poptart_lex/app/bsky/embed/external.dart';
-import 'package:poptart_lex/app/bsky/embed/images.dart';
-import 'package:poptart_lex/app/bsky/embed/record.dart';
-import 'package:poptart_lex/app/bsky/embed/record_with_media.dart';
-import 'package:poptart_lex/app/bsky/embed/video.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
-import 'package:poptart_lex/app/bsky/video/defs.dart';
+import 'package:bluesky_poptart/app/bsky/embed/defs.dart' as embed_defs;
+import 'package:bluesky_poptart/app/bsky/embed/external.dart';
+import 'package:bluesky_poptart/app/bsky/embed/images.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record_with_media.dart';
+import 'package:bluesky_poptart/app/bsky/embed/video.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/video/defs.dart';
 import 'package:poptart_lex/com/atproto/repo/get_record.dart';
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:poptart_bluesky_text/poptart_bluesky_text.dart';
diff --git a/lib/features/devtools/cubit/dev_tools_cubit.dart b/lib/features/devtools/cubit/dev_tools_cubit.dart
index 61cab03..66478ed 100644
--- a/lib/features/devtools/cubit/dev_tools_cubit.dart
+++ b/lib/features/devtools/cubit/dev_tools_cubit.dart
@@ -6,8 +6,8 @@ import 'package:lazurite/core/logging/app_logger.dart';
 import 'package:lazurite/core/network/actor_repository_service_resolver.dart';
 import 'package:lazurite/core/network/atproto_host_resolver.dart';
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/search_actors_typeahead.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/search_actors_typeahead.dart';
 import 'package:poptart_lex/com/atproto/identity/resolve_handle.dart';
 import 'package:poptart_lex/com/atproto/repo/describe_repo.dart';
 import 'package:poptart_lex/com/atproto/repo/get_record.dart';
diff --git a/lib/features/devtools/presentation/dev_tools_screen.dart b/lib/features/devtools/presentation/dev_tools_screen.dart
index 7e457ac..4387ddd 100644
--- a/lib/features/devtools/presentation/dev_tools_screen.dart
+++ b/lib/features/devtools/presentation/dev_tools_screen.dart
@@ -2,7 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:poptart_lex/com/atproto/repo/list_records.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/feed/bloc/feed_bloc.dart b/lib/features/feed/bloc/feed_bloc.dart
index 6697cae..9cea1ab 100644
--- a/lib/features/feed/bloc/feed_bloc.dart
+++ b/lib/features/feed/bloc/feed_bloc.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/feed/data/feed_repository.dart';
diff --git a/lib/features/feed/cubit/feed_preferences_cubit.dart b/lib/features/feed/cubit/feed_preferences_cubit.dart
index 3fb7d31..183b990 100644
--- a/lib/features/feed/cubit/feed_preferences_cubit.dart
+++ b/lib/features/feed/cubit/feed_preferences_cubit.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:drift/drift.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/feed/cubit/post_thread_cubit.dart b/lib/features/feed/cubit/post_thread_cubit.dart
index 4dc1b9e..a1de34d 100644
--- a/lib/features/feed/cubit/post_thread_cubit.dart
+++ b/lib/features/feed/cubit/post_thread_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
diff --git a/lib/features/feed/cubit/saved_posts_cubit.dart b/lib/features/feed/cubit/saved_posts_cubit.dart
index afc288c..8d4454d 100644
--- a/lib/features/feed/cubit/saved_posts_cubit.dart
+++ b/lib/features/feed/cubit/saved_posts_cubit.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/bookmark/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:drift/drift.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/feed/data/feed_repository.dart b/lib/features/feed/data/feed_repository.dart
index d1ab712..8013c18 100644
--- a/lib/features/feed/data/feed_repository.dart
+++ b/lib/features/feed/data/feed_repository.dart
@@ -1,8 +1,8 @@
 import 'package:poptart_core/poptart_core.dart' as atcore show AtUri;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_author_feed.dart';
-import 'package:poptart_lex/app/bsky/unspecced/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_author_feed.dart';
+import 'package:bluesky_poptart/app/bsky/unspecced/defs.dart';
 import 'package:flutter/foundation.dart';
 import 'package:lazurite/core/cache/poptart_cache_codecs.dart';
 import 'package:lazurite/core/cache/offline_cache_policy.dart';
diff --git a/lib/features/feed/data/liked_posts_repository.dart b/lib/features/feed/data/liked_posts_repository.dart
index e2cf7a9..5096962 100644
--- a/lib/features/feed/data/liked_posts_repository.dart
+++ b/lib/features/feed/data/liked_posts_repository.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:lazurite/core/cache/poptart_cache_codecs.dart';
 import 'package:lazurite/core/database/app_database.dart';
diff --git a/lib/features/feed/data/post_action_repository.dart b/lib/features/feed/data/post_action_repository.dart
index 6b7c659..2afe162 100644
--- a/lib/features/feed/data/post_action_repository.dart
+++ b/lib/features/feed/data/post_action_repository.dart
@@ -1,8 +1,8 @@
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
-import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart';
-import 'package:poptart_lex/app/bsky/feed/get_likes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_quotes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/get_bookmarks.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_likes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_quotes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_reposted_by.dart';
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
 import 'package:lazurite/core/network/app_view_request_context.dart';
 
diff --git a/lib/features/feed/data/post_thread_repository.dart b/lib/features/feed/data/post_thread_repository.dart
index 4831628..c027c1c 100644
--- a/lib/features/feed/data/post_thread_repository.dart
+++ b/lib/features/feed/data/post_thread_repository.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart' as atcore;
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_post_thread.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_post_thread.dart';
 import 'package:lazurite/core/cache/poptart_cache_codecs.dart';
 import 'package:lazurite/core/cache/offline_cache_policy.dart';
 import 'package:lazurite/core/database/app_database.dart';
diff --git a/lib/features/feed/data/trending_join.dart b/lib/features/feed/data/trending_join.dart
index 9b0a1fa..78186ea 100644
--- a/lib/features/feed/data/trending_join.dart
+++ b/lib/features/feed/data/trending_join.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/unspecced/defs.dart';
+import 'package:bluesky_poptart/app/bsky/unspecced/defs.dart';
 
 class EnrichedTrendingTopic {
   const EnrichedTrendingTopic({required this.topic, this.trend});
diff --git a/lib/features/feed/presentation/feed_detail_screen.dart b/lib/features/feed/presentation/feed_detail_screen.dart
index 71c6679..e660d05 100644
--- a/lib/features/feed/presentation/feed_detail_screen.dart
+++ b/lib/features/feed/presentation/feed_detail_screen.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/auth/bloc/auth_bloc.dart';
diff --git a/lib/features/feed/presentation/feed_management_screen.dart b/lib/features/feed/presentation/feed_management_screen.dart
index f99eda8..b388762 100644
--- a/lib/features/feed/presentation/feed_management_screen.dart
+++ b/lib/features/feed/presentation/feed_management_screen.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/feed/presentation/home_feed_screen.dart b/lib/features/feed/presentation/home_feed_screen.dart
index 700f48a..cf60f63 100644
--- a/lib/features/feed/presentation/home_feed_screen.dart
+++ b/lib/features/feed/presentation/home_feed_screen.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/feed/presentation/post_thread_screen.dart b/lib/features/feed/presentation/post_thread_screen.dart
index ca00352..9ca7332 100644
--- a/lib/features/feed/presentation/post_thread_screen.dart
+++ b/lib/features/feed/presentation/post_thread_screen.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/saved_posts_screen.dart b/lib/features/feed/presentation/saved_posts_screen.dart
index 92e434f..e97ccfc 100644
--- a/lib/features/feed/presentation/saved_posts_screen.dart
+++ b/lib/features/feed/presentation/saved_posts_screen.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/widgets/compact_post_card.dart b/lib/features/feed/presentation/widgets/compact_post_card.dart
index 37f5287..a0d2c79 100644
--- a/lib/features/feed/presentation/widgets/compact_post_card.dart
+++ b/lib/features/feed/presentation/widgets/compact_post_card.dart
@@ -1,6 +1,6 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
 import 'package:lazurite/core/theme/theme_extensions.dart';
diff --git a/lib/features/feed/presentation/widgets/facet_text.dart b/lib/features/feed/presentation/widgets/facet_text.dart
index 63a43a6..ee64fe9 100644
--- a/lib/features/feed/presentation/widgets/facet_text.dart
+++ b/lib/features/feed/presentation/widgets/facet_text.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'package:lazurite/core/theme/theme_extensions.dart';
 
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
 import 'package:poptart_bluesky_text/poptart_bluesky_text.dart';
 import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
diff --git a/lib/features/feed/presentation/widgets/grid_post_card.dart b/lib/features/feed/presentation/widgets/grid_post_card.dart
index ba84626..9114c36 100644
--- a/lib/features/feed/presentation/widgets/grid_post_card.dart
+++ b/lib/features/feed/presentation/widgets/grid_post_card.dart
@@ -1,7 +1,7 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/embed/record_with_media.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record_with_media.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/cache/lazurite_image_cache.dart';
diff --git a/lib/features/feed/presentation/widgets/post_card.dart b/lib/features/feed/presentation/widgets/post_card.dart
index 237285f..23dd169 100644
--- a/lib/features/feed/presentation/widgets/post_card.dart
+++ b/lib/features/feed/presentation/widgets/post_card.dart
@@ -1,6 +1,6 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
 import 'package:lazurite/core/theme/theme_extensions.dart';
diff --git a/lib/features/feed/presentation/widgets/post_card_with_actions.dart b/lib/features/feed/presentation/widgets/post_card_with_actions.dart
index f3d8716..58fea11 100644
--- a/lib/features/feed/presentation/widgets/post_card_with_actions.dart
+++ b/lib/features/feed/presentation/widgets/post_card_with_actions.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/feed/presentation/widgets/post_embed_view.dart b/lib/features/feed/presentation/widgets/post_embed_view.dart
index fb701b1..5017278 100644
--- a/lib/features/feed/presentation/widgets/post_embed_view.dart
+++ b/lib/features/feed/presentation/widgets/post_embed_view.dart
@@ -1,10 +1,10 @@
-import 'package:poptart_lex/app/bsky/embed/external.dart';
-import 'package:poptart_lex/app/bsky/embed/images.dart';
-import 'package:poptart_lex/app/bsky/embed/record.dart';
-import 'package:poptart_lex/app/bsky/embed/record_with_media.dart';
-import 'package:poptart_lex/app/bsky/embed/video.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/embed/external.dart';
+import 'package:bluesky_poptart/app/bsky/embed/images.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record_with_media.dart';
+import 'package:bluesky_poptart/app/bsky/embed/video.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/feed/presentation/widgets/post_interactions_sheet.dart b/lib/features/feed/presentation/widgets/post_interactions_sheet.dart
index d08f292..a4d034c 100644
--- a/lib/features/feed/presentation/widgets/post_interactions_sheet.dart
+++ b/lib/features/feed/presentation/widgets/post_interactions_sheet.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/cache/lazurite_image_cache.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/feed/presentation/widgets/post_menu_actions.dart b/lib/features/feed/presentation/widgets/post_menu_actions.dart
index 706d415..96abe01 100644
--- a/lib/features/feed/presentation/widgets/post_menu_actions.dart
+++ b/lib/features/feed/presentation/widgets/post_menu_actions.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter/services.dart';
diff --git a/lib/features/feed/presentation/widgets/post_quote_repost_sheet.dart b/lib/features/feed/presentation/widgets/post_quote_repost_sheet.dart
index c62bd67..b6f44fe 100644
--- a/lib/features/feed/presentation/widgets/post_quote_repost_sheet.dart
+++ b/lib/features/feed/presentation/widgets/post_quote_repost_sheet.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:lazurite/core/cache/lazurite_image_cache.dart';
diff --git a/lib/features/feed/presentation/widgets/post_repost_context.dart b/lib/features/feed/presentation/widgets/post_repost_context.dart
index 465a73e..5d332f2 100644
--- a/lib/features/feed/presentation/widgets/post_repost_context.dart
+++ b/lib/features/feed/presentation/widgets/post_repost_context.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
 import 'package:lazurite/core/theme/theme_extensions.dart';
diff --git a/lib/features/lists/bloc/list_bloc.dart b/lib/features/lists/bloc/list_bloc.dart
index 3b501f0..d7d517b 100644
--- a/lib/features/lists/bloc/list_bloc.dart
+++ b/lib/features/lists/bloc/list_bloc.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri, Blob;
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/lists/data/list_repository.dart';
diff --git a/lib/features/lists/bloc/list_feed_bloc.dart b/lib/features/lists/bloc/list_feed_bloc.dart
index 9b9bf7f..3664fee 100644
--- a/lib/features/lists/bloc/list_feed_bloc.dart
+++ b/lib/features/lists/bloc/list_feed_bloc.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/lists/data/list_repository.dart';
diff --git a/lib/features/lists/cubit/add_to_list_cubit.dart b/lib/features/lists/cubit/add_to_list_cubit.dart
index c02da99..4b6bb44 100644
--- a/lib/features/lists/cubit/add_to_list_cubit.dart
+++ b/lib/features/lists/cubit/add_to_list_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/graph/get_lists_with_membership.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_lists_with_membership.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/lists/data/list_repository.dart';
diff --git a/lib/features/lists/cubit/my_lists_cubit.dart b/lib/features/lists/cubit/my_lists_cubit.dart
index 6efb2f5..a8e9d00 100644
--- a/lib/features/lists/cubit/my_lists_cubit.dart
+++ b/lib/features/lists/cubit/my_lists_cubit.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri, Blob;
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/lists/data/list_repository.dart';
diff --git a/lib/features/lists/data/list_repository.dart b/lib/features/lists/data/list_repository.dart
index c997a03..c42e20f 100644
--- a/lib/features/lists/data/list_repository.dart
+++ b/lib/features/lists/data/list_repository.dart
@@ -1,11 +1,11 @@
 import 'dart:typed_data';
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/get_lists.dart';
-import 'package:poptart_lex/app/bsky/graph/get_lists_with_membership.dart';
-import 'package:poptart_lex/app/bsky/graph/list.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_lists.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_lists_with_membership.dart';
+import 'package:bluesky_poptart/app/bsky/graph/list.dart';
 import 'package:lazurite/core/network/app_view_request_context.dart';
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
 import 'package:lazurite/features/moderation/data/moderation_service.dart';
diff --git a/lib/features/lists/presentation/list_detail_screen.dart b/lib/features/lists/presentation/list_detail_screen.dart
index 2a97886..dad4c81 100644
--- a/lib/features/lists/presentation/list_detail_screen.dart
+++ b/lib/features/lists/presentation/list_detail_screen.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/lists/presentation/list_members_screen.dart b/lib/features/lists/presentation/list_members_screen.dart
index eb40af7..4cac96e 100644
--- a/lib/features/lists/presentation/list_members_screen.dart
+++ b/lib/features/lists/presentation/list_members_screen.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/lists/presentation/my_lists_screen.dart b/lib/features/lists/presentation/my_lists_screen.dart
index a9800eb..6b91cf0 100644
--- a/lib/features/lists/presentation/my_lists_screen.dart
+++ b/lib/features/lists/presentation/my_lists_screen.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/lists/presentation/widgets/create_edit_list_dialog.dart b/lib/features/lists/presentation/widgets/create_edit_list_dialog.dart
index d217add..6faae1d 100644
--- a/lib/features/lists/presentation/widgets/create_edit_list_dialog.dart
+++ b/lib/features/lists/presentation/widgets/create_edit_list_dialog.dart
@@ -3,7 +3,7 @@ import 'dart:typed_data';
 import 'package:lazurite/core/l10n/l10n.dart';
 import 'package:lazurite/core/theme/theme_extensions.dart';
 
-import 'package:poptart_lex/app/bsky/graph/defs.dart' show KnownListPurpose;
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' show KnownListPurpose;
 import 'package:flutter/material.dart';
 import 'package:image_picker/image_picker.dart';
 
diff --git a/lib/features/lists/presentation/widgets/list_row_tile.dart b/lib/features/lists/presentation/widgets/list_row_tile.dart
index a5ad587..d90f51a 100644
--- a/lib/features/lists/presentation/widgets/list_row_tile.dart
+++ b/lib/features/lists/presentation/widgets/list_row_tile.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
 import 'package:lazurite/core/theme/theme_extensions.dart';
diff --git a/lib/features/messages/bloc/convo_list_bloc.dart b/lib/features/messages/bloc/convo_list_bloc.dart
index cbc770c..b1a290b 100644
--- a/lib/features/messages/bloc/convo_list_bloc.dart
+++ b/lib/features/messages/bloc/convo_list_bloc.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
diff --git a/lib/features/messages/bloc/message_bloc.dart b/lib/features/messages/bloc/message_bloc.dart
index 61a8606..3bfffdb 100644
--- a/lib/features/messages/bloc/message_bloc.dart
+++ b/lib/features/messages/bloc/message_bloc.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/chat/bsky/convo/get_messages.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/get_messages.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
diff --git a/lib/features/messages/data/convo_repository.dart b/lib/features/messages/data/convo_repository.dart
index d1b6f7a..0c48e41 100644
--- a/lib/features/messages/data/convo_repository.dart
+++ b/lib/features/messages/data/convo_repository.dart
@@ -1,6 +1,6 @@
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
-import 'package:poptart_lex/chat/bsky/convo/get_messages.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/get_messages.dart';
 import 'package:lazurite/core/network/unauthorized_recovery_runner.dart';
 import 'package:lazurite/core/network/xrpc_client_factory.dart';
 import 'package:lazurite/features/auth/data/models/auth_models.dart';
diff --git a/lib/features/messages/presentation/message_thread_screen.dart b/lib/features/messages/presentation/message_thread_screen.dart
index 40ca147..544751a 100644
--- a/lib/features/messages/presentation/message_thread_screen.dart
+++ b/lib/features/messages/presentation/message_thread_screen.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/chat/bsky/convo/get_messages.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/get_messages.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/messages/presentation/widgets/convo_list_item.dart b/lib/features/messages/presentation/widgets/convo_list_item.dart
index a218e0a..1f2b10c 100644
--- a/lib/features/messages/presentation/widgets/convo_list_item.dart
+++ b/lib/features/messages/presentation/widgets/convo_list_item.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
 import 'package:lazurite/core/theme/theme_extensions.dart';
diff --git a/lib/features/messages/presentation/widgets/convo_list_pane.dart b/lib/features/messages/presentation/widgets/convo_list_pane.dart
index 1bfb87c..9c690a8 100644
--- a/lib/features/messages/presentation/widgets/convo_list_pane.dart
+++ b/lib/features/messages/presentation/widgets/convo_list_pane.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/messages/presentation/widgets/message_bubble.dart b/lib/features/messages/presentation/widgets/message_bubble.dart
index bfd0267..fe2c5df 100644
--- a/lib/features/messages/presentation/widgets/message_bubble.dart
+++ b/lib/features/messages/presentation/widgets/message_bubble.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/moderation/data/moderation_service.dart b/lib/features/moderation/data/moderation_service.dart
index ed1c181..8f60325 100644
--- a/lib/features/moderation/data/moderation_service.dart
+++ b/lib/features/moderation/data/moderation_service.dart
@@ -1,17 +1,17 @@
 import 'dart:async';
-import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/get_preferences.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/labeler/defs.dart';
-import 'package:poptart_lex/app/bsky/labeler/get_services.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as notifications;
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/defs.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/get_services.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as notifications;
 import 'package:lazurite/core/cache/poptart_cache_codecs.dart';
 import 'package:lazurite/core/database/app_database.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
 import 'package:lazurite/core/network/app_view_request_context.dart';
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as moderation;
+import 'package:poptart_lex/com/atproto/label/defs.dart';
 
 const _officialBlueskyLabelerDid = 'did:plc:ar7c4by46qjdydhdevvrndac';
 const _maxCustomLabelers = 20;
@@ -44,17 +44,17 @@ class ModerationService {
   final String? _userDid;
   final AppViewRequestContext _appViewContext;
 
-  bsky_moderation.ModerationOpts? _opts;
+  moderation.ModerationOpts? _opts;
   List<UPreferences> _preferences = const [];
   late Map<String, String> _headers;
   Future<void>? _initializationFuture;
   bool _disposed = false;
-  final _optsController = StreamController<bsky_moderation.ModerationOpts>.broadcast();
+  final _optsController = StreamController<moderation.ModerationOpts>.broadcast();
   final Map<String, LabelerPolicies> _labelerPoliciesByDid = {};
 
-  Stream<bsky_moderation.ModerationOpts> get optsStream => _optsController.stream;
-  bsky_moderation.ModerationOpts? get currentOpts => _opts;
-  bsky_moderation.ModerationPrefs? get currentPrefs => _opts?.prefs;
+  Stream<moderation.ModerationOpts> get optsStream => _optsController.stream;
+  moderation.ModerationOpts? get currentOpts => _opts;
+  moderation.ModerationPrefs? get currentPrefs => _opts?.prefs;
   List<UPreferences> get currentPreferences => List.unmodifiable(_preferences);
   Map<String, String> get currentHeaders => Map.unmodifiable(_headers);
 
@@ -185,81 +185,170 @@ class ModerationService {
     await _putAndRefresh(updated);
   }
 
-  bsky_moderation.ModerationDecision moderateFeedViewPost(FeedViewPost post) => moderatePost(post.post);
+  moderation.ModerationDecision moderateFeedViewPost(FeedViewPost post) => moderatePost(post.post);
 
-  bsky_moderation.ModerationDecision moderatePost(PostView post) {
+  moderation.ModerationDecision moderatePost(PostView post) {
     final opts = _opts;
     if (opts == null) {
-      return bsky_moderation.ModerationDecision.merge(const []);
+      return const moderation.ModerationDecision.empty();
     }
 
-    return bsky_moderation.moderatePost(bsky_moderation.ModerationSubjectPost.postView(data: post), opts);
+    return moderation.ModerationDecision(
+      me: post.author.did == _resolvedUserDid,
+      causes: [
+        if (opts.prefs.hiddenPosts.contains(post.uri.toString())) _hiddenCause(),
+        ..._viewerCauses(post.author.viewer),
+        ..._labelCauses(post.labels ?? const [], moderation.LabelTarget.content, opts),
+        ..._labelCauses(post.author.labels ?? const [], moderation.LabelTarget.account, opts),
+      ],
+    );
   }
 
-  bsky_moderation.ModerationDecision moderateProfile(ProfileView profile) {
+  moderation.ModerationDecision moderateProfile(ProfileView profile) {
     final opts = _opts;
     if (opts == null) {
-      return bsky_moderation.ModerationDecision.merge(const []);
+      return const moderation.ModerationDecision.empty();
     }
 
-    return bsky_moderation.moderateProfile(bsky_moderation.ModerationSubjectProfile.profileView(data: profile), opts);
+    return _moderateActor(did: profile.did, viewer: profile.viewer, labels: profile.labels ?? const [], opts: opts);
   }
 
-  bsky_moderation.ModerationDecision moderateProfileBasic(ProfileViewBasic profile) {
+  moderation.ModerationDecision moderateProfileBasic(ProfileViewBasic profile) {
     final opts = _opts;
     if (opts == null) {
-      return bsky_moderation.ModerationDecision.merge(const []);
+      return const moderation.ModerationDecision.empty();
     }
 
-    return bsky_moderation.moderateProfile(
-      bsky_moderation.ModerationSubjectProfile.profileViewBasic(data: profile),
-      opts,
-    );
+    return _moderateActor(did: profile.did, viewer: profile.viewer, labels: profile.labels ?? const [], opts: opts);
   }
 
-  bsky_moderation.ModerationDecision moderateProfileDetailed(ProfileViewDetailed profile) {
+  moderation.ModerationDecision moderateProfileDetailed(ProfileViewDetailed profile) {
     final opts = _opts;
     if (opts == null) {
-      return bsky_moderation.ModerationDecision.merge(const []);
+      return const moderation.ModerationDecision.empty();
     }
 
-    return bsky_moderation.moderateProfile(
-      bsky_moderation.ModerationSubjectProfile.profileViewDetailed(data: profile),
-      opts,
-    );
+    return _moderateActor(did: profile.did, viewer: profile.viewer, labels: profile.labels ?? const [], opts: opts);
   }
 
-  bsky_moderation.ModerationDecision moderateNotification(notifications.Notification notification) {
+  moderation.ModerationDecision moderateNotification(notifications.Notification notification) {
     final opts = _opts;
     if (opts == null) {
-      return bsky_moderation.ModerationDecision.merge(const []);
+      return const moderation.ModerationDecision.empty();
+    }
+
+    return moderation.ModerationDecision.merge([
+      _moderateActor(
+        did: notification.author.did,
+        viewer: notification.author.viewer,
+        labels: notification.author.labels ?? const [],
+        opts: opts,
+      ),
+      moderation.ModerationDecision(
+        me: notification.author.did == _resolvedUserDid,
+        causes: _labelCauses(notification.labels ?? const [], moderation.LabelTarget.content, opts),
+      ),
+    ]);
+  }
+
+  moderation.ModerationDecision _moderateActor({
+    required String did,
+    required dynamic viewer,
+    required List<Label> labels,
+    required moderation.ModerationOpts opts,
+  }) {
+    return moderation.ModerationDecision(
+      me: did == _resolvedUserDid,
+      causes: [
+        ..._viewerCauses(viewer),
+        ..._labelCauses(labels, moderation.LabelTarget.account, opts),
+        ..._labelCauses(labels, moderation.LabelTarget.profile, opts),
+      ],
+    );
+  }
+
+  List<moderation.ModerationCause> _viewerCauses(dynamic viewer) {
+    if (viewer == null) {
+      return const [];
+    }
+
+    final causes = <moderation.ModerationCause>[];
+    try {
+      if (viewer.muted == true) {
+        causes.add(_mutedCause());
+      }
+      if (viewer.blockedBy == true) {
+        causes.add(_blockedByCause());
+      }
+      if (viewer.blocking != null) {
+        causes.add(_blockingCause());
+      }
+    } catch (error, stackTrace) {
+      log.d('Unable to read moderation viewer state: $error\n$stackTrace');
+    }
+    return causes;
+  }
+
+  List<moderation.ModerationCause> _labelCauses(
+    List<Label> labels,
+    moderation.LabelTarget target,
+    moderation.ModerationOpts opts,
+  ) {
+    return labels
+        .map((label) => _labelCause(label, target, opts))
+        .whereType<moderation.ModerationCause>()
+        .toList(growable: false);
+  }
+
+  moderation.ModerationCause? _labelCause(Label label, moderation.LabelTarget target, moderation.ModerationOpts opts) {
+    final definition = _definitionForLabel(label, opts);
+    if (definition == null) {
+      return null;
+    }
+
+    final labeler = opts.prefs.labelers.where((item) => item.did == label.src).firstOrNull;
+    final isSelf = label.src == _resolvedUserDid;
+    if (!isSelf && labeler == null && !moderation.knownLabelDefinitions.containsKey(label.val)) {
+      return null;
+    }
+
+    final setting = _preferenceForLabel(definition, labeler, opts.prefs);
+    if (setting == moderation.LabelPreference.ignore) {
+      return null;
     }
 
-    return bsky_moderation.moderateNotification(
-      bsky_moderation.ModerationSubjectNotification.notification(data: notification),
-      opts,
+    return moderation.ModerationCause.label(
+      data: moderation.ModerationCauseLabel(
+        source: isSelf || labeler == null
+            ? const moderation.ModerationCauseSource.user(data: moderation.ModerationCauseSourceUser())
+            : moderation.ModerationCauseSource.labeler(data: moderation.ModerationCauseSourceLabeler(did: labeler.did)),
+        label: label,
+        labelDef: definition,
+        target: target,
+        setting: setting,
+        behavior: definition.behaviorForTarget(target),
+        noOverride: definition.noOverride || (definition.adultOnly && !opts.prefs.adultContentEnabled),
+      ),
     );
   }
 
-  bsky_moderation.ModerationUI postUi(PostView post, bsky_moderation.ModerationBehaviorContext context) =>
+  moderation.ModerationUI postUi(PostView post, moderation.ModerationBehaviorContext context) =>
       moderatePost(post).getUI(context);
 
-  bsky_moderation.ModerationUI profileUi(ProfileView profile, bsky_moderation.ModerationBehaviorContext context) =>
+  moderation.ModerationUI profileUi(ProfileView profile, moderation.ModerationBehaviorContext context) =>
       moderateProfile(profile).getUI(context);
 
-  bsky_moderation.ModerationUI profileBasicUi(
-    ProfileViewBasic profile,
-    bsky_moderation.ModerationBehaviorContext context,
-  ) => moderateProfileBasic(profile).getUI(context);
+  moderation.ModerationUI profileBasicUi(ProfileViewBasic profile, moderation.ModerationBehaviorContext context) =>
+      moderateProfileBasic(profile).getUI(context);
 
-  bsky_moderation.ModerationUI profileDetailedUi(
+  moderation.ModerationUI profileDetailedUi(
     ProfileViewDetailed profile,
-    bsky_moderation.ModerationBehaviorContext context,
+    moderation.ModerationBehaviorContext context,
   ) => moderateProfileDetailed(profile).getUI(context);
 
-  bsky_moderation.ModerationUI notificationUi(
+  moderation.ModerationUI notificationUi(
     notifications.Notification notification,
-    bsky_moderation.ModerationBehaviorContext context,
+    moderation.ModerationBehaviorContext context,
   ) => moderateNotification(notification).getUI(context);
 
   String? resolveLabelDisplayName({
@@ -309,25 +398,23 @@ class ModerationService {
 
   bool shouldFilterFeedViewPostInList(FeedViewPost post) => shouldFilterPostInList(post.post);
 
-  bool shouldFilterPostInList(PostView post) =>
-      postUi(post, bsky_moderation.ModerationBehaviorContext.contentList).filter;
+  bool shouldFilterPostInList(PostView post) => postUi(post, moderation.ModerationBehaviorContext.contentList).filter;
 
-  bool shouldFilterPostInView(PostView post) =>
-      postUi(post, bsky_moderation.ModerationBehaviorContext.contentView).filter;
+  bool shouldFilterPostInView(PostView post) => postUi(post, moderation.ModerationBehaviorContext.contentView).filter;
 
   bool shouldFilterProfileInList(ProfileView profile) =>
-      profileUi(profile, bsky_moderation.ModerationBehaviorContext.profileList).filter;
+      profileUi(profile, moderation.ModerationBehaviorContext.profileList).filter;
 
   bool shouldFilterProfileBasicInList(ProfileViewBasic profile) =>
-      profileBasicUi(profile, bsky_moderation.ModerationBehaviorContext.profileList).filter;
+      profileBasicUi(profile, moderation.ModerationBehaviorContext.profileList).filter;
 
   bool shouldFilterProfileDetailedInView(ProfileViewDetailed profile) =>
-      profileDetailedUi(profile, bsky_moderation.ModerationBehaviorContext.profileView).filter;
+      profileDetailedUi(profile, moderation.ModerationBehaviorContext.profileView).filter;
 
   bool shouldFilterNotificationInList(notifications.Notification notification) {
     final decision = moderateNotification(notification);
-    return decision.getUI(bsky_moderation.ModerationBehaviorContext.contentList).filter ||
-        decision.getUI(bsky_moderation.ModerationBehaviorContext.profileList).filter;
+    return decision.getUI(moderation.ModerationBehaviorContext.contentList).filter ||
+        decision.getUI(moderation.ModerationBehaviorContext.profileList).filter;
   }
 
   void dispose() {
@@ -345,11 +432,7 @@ class ModerationService {
 
       final moderationPrefs = _toModerationPrefs(resolvedPreferences);
       final labelDefs = await _loadLabelDefinitions(moderationPrefs);
-      final opts = bsky_moderation.ModerationOpts(
-        userDid: _resolvedUserDid,
-        prefs: moderationPrefs,
-        labelDefs: labelDefs,
-      );
+      final opts = moderation.ModerationOpts(userDid: _resolvedUserDid, prefs: moderationPrefs, labelDefs: labelDefs);
 
       _preferences = resolvedPreferences;
       _headers = _buildHeadersForPrefs(moderationPrefs);
@@ -403,8 +486,8 @@ class ModerationService {
     await updatePreferences(preferences: preferences);
   }
 
-  Future<Map<String, List<bsky_moderation.InterpretedLabelValueDefinition>>> _loadLabelDefinitions(
-    bsky_moderation.ModerationPrefs prefs,
+  Future<Map<String, List<moderation.InterpretedLabelValueDefinition>>> _loadLabelDefinitions(
+    moderation.ModerationPrefs prefs,
   ) async {
     final labelerDids = {
       _officialBlueskyLabelerDid,
@@ -458,14 +541,14 @@ class ModerationService {
     }
   }
 
-  Future<Map<String, List<bsky_moderation.InterpretedLabelValueDefinition>>> _loadCachedLabelDefinitions(
+  Future<Map<String, List<moderation.InterpretedLabelValueDefinition>>> _loadCachedLabelDefinitions(
     List<String> labelerDids,
   ) async {
     if (_database == null) {
       return const {};
     }
 
-    final definitions = <String, List<bsky_moderation.InterpretedLabelValueDefinition>>{};
+    final definitions = <String, List<moderation.InterpretedLabelValueDefinition>>{};
     for (final did in labelerDids) {
       final cached = await _database.getLabelerCache(did);
       if (cached == null) {
@@ -558,16 +641,55 @@ class ModerationService {
     return updated;
   }
 
-  bsky_moderation.ModerationPrefs _toModerationPrefs(List<UPreferences> preferences) {
-    return ActorGetPreferencesOutput(
-      preferences: preferences,
-    ).getModerationPrefs(appLabelers: const [_officialBlueskyLabelerDid]);
+  moderation.ModerationPrefs _toModerationPrefs(List<UPreferences> preferences) {
+    var adultContentEnabled = false;
+    final globalLabels = <String, moderation.LabelPreference>{};
+    final labelsByLabeler = <String, Map<String, moderation.LabelPreference>>{};
+    final labelerDids = <String>{_officialBlueskyLabelerDid};
+    final mutedWords = <MutedWord>[];
+    final hiddenPosts = <String>[];
+
+    for (final preference in preferences) {
+      if (preference.isAdultContentPref) {
+        adultContentEnabled = preference.adultContentPref!.enabled;
+      } else if (preference.isContentLabelPref) {
+        final contentLabel = preference.contentLabelPref!;
+        final value = _labelPreferenceFromVisibility(contentLabel.visibility);
+        if (value == null) {
+          continue;
+        }
+        final labelerDid = contentLabel.labelerDid;
+        if (labelerDid == null || labelerDid.isEmpty) {
+          globalLabels[contentLabel.label] = value;
+        } else {
+          labelsByLabeler.putIfAbsent(labelerDid, () => {})[contentLabel.label] = value;
+        }
+      } else if (preference.isLabelersPref) {
+        labelerDids.addAll(
+          preference.labelersPref!.labelers.map((labeler) => labeler.did).where((did) => did.startsWith('did:')),
+        );
+      } else if (preference.isMutedWordsPref) {
+        mutedWords.addAll(preference.mutedWordsPref!.items);
+      } else if (preference.isHiddenPostsPref) {
+        hiddenPosts.addAll(preference.hiddenPostsPref!.items.map((uri) => uri.toString()));
+      }
+    }
+
+    return moderation.ModerationPrefs(
+      adultContentEnabled: adultContentEnabled,
+      labels: globalLabels,
+      labelers: labelerDids
+          .map((did) => moderation.ModerationPrefsLabeler(did: did, labels: labelsByLabeler[did] ?? const {}))
+          .toList(growable: false),
+      mutedWords: mutedWords,
+      hiddenPosts: hiddenPosts,
+    );
   }
 
-  Map<String, List<bsky_moderation.InterpretedLabelValueDefinition>> _mapLabelDefinitions(
+  Map<String, List<moderation.InterpretedLabelValueDefinition>> _mapLabelDefinitions(
     List<ULabelerGetServicesViews> views,
   ) {
-    final definitions = <String, List<bsky_moderation.InterpretedLabelValueDefinition>>{};
+    final definitions = <String, List<moderation.InterpretedLabelValueDefinition>>{};
 
     for (final view in views) {
       if (!view.isLabelerViewDetailed) {
@@ -584,17 +706,17 @@ class ModerationService {
     return definitions;
   }
 
-  List<bsky_moderation.InterpretedLabelValueDefinition> _interpretedLabelDefinitionsFromPolicies(
+  List<moderation.InterpretedLabelValueDefinition> _interpretedLabelDefinitionsFromPolicies(
     LabelerPolicies policies, {
     required String labelerDid,
   }) {
     return policies.labelValueDefinitions
             ?.map(
-              (definition) => bsky_moderation.getInterpretedLabelValueDefinition(
+              (definition) => moderation.getInterpretedLabelValueDefinition(
                 identifier: definition.identifier,
                 defaultSetting:
-                    bsky_moderation.LabelPreference.valueOf(definition.defaultSetting?.toJson()) ??
-                    bsky_moderation.LabelPreference.warn,
+                    moderation.LabelPreference.valueOf(definition.defaultSetting?.toJson()) ??
+                    moderation.LabelPreference.warn,
                 severity: definition.severity.toJson(),
                 blurs: definition.blurs.toJson(),
                 adultOnly: definition.adultOnly ?? true,
@@ -605,7 +727,70 @@ class ModerationService {
         const [];
   }
 
-  Map<String, String> _buildHeadersForPrefs(bsky_moderation.ModerationPrefs prefs) {
+  moderation.InterpretedLabelValueDefinition? _definitionForLabel(Label label, moderation.ModerationOpts opts) {
+    final custom = opts.labelDefs[label.src]?.where((definition) => definition.identifier == label.val).firstOrNull;
+    if (custom != null) {
+      return custom.withDefinedBy(label.src);
+    }
+    return moderation.knownLabelDefinitions[label.val]?.withDefinedBy(label.src);
+  }
+
+  moderation.LabelPreference _preferenceForLabel(
+    moderation.InterpretedLabelValueDefinition definition,
+    moderation.ModerationPrefsLabeler? labeler,
+    moderation.ModerationPrefs prefs,
+  ) {
+    if (!definition.configurable) {
+      return definition.defaultSetting;
+    }
+    if (definition.adultOnly && !prefs.adultContentEnabled) {
+      return moderation.LabelPreference.hide;
+    }
+    return labeler?.labels[definition.identifier] ?? prefs.labels[definition.identifier] ?? definition.defaultSetting;
+  }
+
+  moderation.LabelPreference? _labelPreferenceFromVisibility(ContentLabelPrefVisibility visibility) {
+    return switch (visibility.toJson()) {
+      'ignore' || 'show' => moderation.LabelPreference.ignore,
+      'warn' => moderation.LabelPreference.warn,
+      'hide' => moderation.LabelPreference.hide,
+      _ => null,
+    };
+  }
+
+  moderation.ModerationCause _hiddenCause() {
+    return const moderation.ModerationCause.hidden(
+      data: moderation.ModerationCauseHidden(
+        source: moderation.ModerationCauseSource.user(data: moderation.ModerationCauseSourceUser()),
+      ),
+    );
+  }
+
+  moderation.ModerationCause _mutedCause() {
+    return const moderation.ModerationCause.muted(
+      data: moderation.ModerationCauseMuted(
+        source: moderation.ModerationCauseSource.user(data: moderation.ModerationCauseSourceUser()),
+      ),
+    );
+  }
+
+  moderation.ModerationCause _blockingCause() {
+    return const moderation.ModerationCause.blocking(
+      data: moderation.ModerationCauseBlocking(
+        source: moderation.ModerationCauseSource.user(data: moderation.ModerationCauseSourceUser()),
+      ),
+    );
+  }
+
+  moderation.ModerationCause _blockedByCause() {
+    return const moderation.ModerationCause.blockedBy(
+      data: moderation.ModerationCauseBlockedBy(
+        source: moderation.ModerationCauseSource.user(data: moderation.ModerationCauseSourceUser()),
+      ),
+    );
+  }
+
+  Map<String, String> _buildHeadersForPrefs(moderation.ModerationPrefs prefs) {
     return _appViewContext.appBskyHeadersForEndpoint(
       'app.bsky.labeler.getServices',
       _buildLabelerHeaders(prefs.labelers.map((labeler) => labeler.did)),
diff --git a/lib/features/moderation/domain/moderation_models.dart b/lib/features/moderation/domain/moderation_models.dart
new file mode 100644
index 0000000..0b5ece7
--- /dev/null
+++ b/lib/features/moderation/domain/moderation_models.dart
@@ -0,0 +1,574 @@
+import 'package:poptart_lex/com/atproto/label/defs.dart';
+
+enum ModerationBehavior { blur, alert, inform, none }
+
+enum ModerationBehaviorContext {
+  profileList,
+  profileView,
+  avatar,
+  banner,
+  displayName,
+  contentList,
+  contentView,
+  contentMedia;
+
+  bool get isProfileList => this == ModerationBehaviorContext.profileList;
+  bool get isProfileView => this == ModerationBehaviorContext.profileView;
+  bool get isContentList => this == ModerationBehaviorContext.contentList;
+}
+
+enum LabelPreference {
+  ignore,
+  warn,
+  hide;
+
+  static LabelPreference? valueOf(String? value) {
+    return switch (value) {
+      'ignore' => LabelPreference.ignore,
+      'warn' => LabelPreference.warn,
+      'hide' => LabelPreference.hide,
+      _ => null,
+    };
+  }
+}
+
+enum LabelTarget { account, profile, content }
+
+class InterpretedLabelValueDefinition {
+  const InterpretedLabelValueDefinition({
+    required this.identifier,
+    required this.severity,
+    required this.blurs,
+    required this.definedBy,
+    this.defaultSetting = LabelPreference.warn,
+    this.configurable = true,
+    this.adultOnly = false,
+    this.noOverride = false,
+    this.behaviors = const {},
+  });
+
+  final String identifier;
+  final String severity;
+  final String blurs;
+  final String definedBy;
+  final LabelPreference defaultSetting;
+  final bool configurable;
+  final bool adultOnly;
+  final bool noOverride;
+  final Map<LabelTarget, Map<ModerationBehaviorContext, ModerationBehavior>> behaviors;
+
+  InterpretedLabelValueDefinition withDefinedBy(String did) {
+    return InterpretedLabelValueDefinition(
+      identifier: identifier,
+      severity: severity,
+      blurs: blurs,
+      definedBy: did,
+      defaultSetting: defaultSetting,
+      configurable: configurable,
+      adultOnly: adultOnly,
+      noOverride: noOverride,
+      behaviors: behaviors,
+    );
+  }
+
+  Map<ModerationBehaviorContext, ModerationBehavior> behaviorForTarget(LabelTarget target) {
+    return behaviors[target] ?? const {};
+  }
+}
+
+const knownLabelDefinitions = {
+  '!hide': InterpretedLabelValueDefinition(
+    identifier: '!hide',
+    defaultSetting: LabelPreference.hide,
+    severity: 'alert',
+    blurs: 'content',
+    noOverride: true,
+    definedBy: '',
+    behaviors: {
+      LabelTarget.account: {
+        ModerationBehaviorContext.profileList: ModerationBehavior.blur,
+        ModerationBehaviorContext.profileView: ModerationBehavior.blur,
+        ModerationBehaviorContext.avatar: ModerationBehavior.blur,
+        ModerationBehaviorContext.banner: ModerationBehavior.blur,
+        ModerationBehaviorContext.displayName: ModerationBehavior.blur,
+        ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+        ModerationBehaviorContext.contentView: ModerationBehavior.blur,
+      },
+      LabelTarget.profile: {
+        ModerationBehaviorContext.avatar: ModerationBehavior.blur,
+        ModerationBehaviorContext.banner: ModerationBehavior.blur,
+        ModerationBehaviorContext.displayName: ModerationBehavior.blur,
+      },
+      LabelTarget.content: {
+        ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+        ModerationBehaviorContext.contentView: ModerationBehavior.blur,
+      },
+    },
+  ),
+  '!warn': InterpretedLabelValueDefinition(
+    identifier: '!warn',
+    defaultSetting: LabelPreference.warn,
+    severity: 'none',
+    blurs: 'content',
+    definedBy: '',
+    behaviors: {
+      LabelTarget.account: {
+        ModerationBehaviorContext.profileList: ModerationBehavior.blur,
+        ModerationBehaviorContext.profileView: ModerationBehavior.blur,
+        ModerationBehaviorContext.avatar: ModerationBehavior.blur,
+        ModerationBehaviorContext.banner: ModerationBehavior.blur,
+        ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+        ModerationBehaviorContext.contentView: ModerationBehavior.blur,
+      },
+      LabelTarget.profile: {
+        ModerationBehaviorContext.avatar: ModerationBehavior.blur,
+        ModerationBehaviorContext.banner: ModerationBehavior.blur,
+        ModerationBehaviorContext.displayName: ModerationBehavior.blur,
+      },
+      LabelTarget.content: {
+        ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+        ModerationBehaviorContext.contentView: ModerationBehavior.blur,
+      },
+    },
+  ),
+  '!no-unauthenticated': InterpretedLabelValueDefinition(
+    identifier: '!no-unauthenticated',
+    defaultSetting: LabelPreference.hide,
+    severity: 'none',
+    blurs: 'content',
+    noOverride: true,
+    definedBy: '',
+    behaviors: {
+      LabelTarget.account: {
+        ModerationBehaviorContext.profileList: ModerationBehavior.blur,
+        ModerationBehaviorContext.profileView: ModerationBehavior.blur,
+        ModerationBehaviorContext.avatar: ModerationBehavior.blur,
+        ModerationBehaviorContext.banner: ModerationBehavior.blur,
+        ModerationBehaviorContext.displayName: ModerationBehavior.blur,
+        ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+        ModerationBehaviorContext.contentView: ModerationBehavior.blur,
+      },
+      LabelTarget.profile: {
+        ModerationBehaviorContext.avatar: ModerationBehavior.blur,
+        ModerationBehaviorContext.banner: ModerationBehavior.blur,
+        ModerationBehaviorContext.displayName: ModerationBehavior.blur,
+      },
+      LabelTarget.content: {
+        ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+        ModerationBehaviorContext.contentView: ModerationBehavior.blur,
+      },
+    },
+  ),
+  'porn': InterpretedLabelValueDefinition(
+    identifier: 'porn',
+    configurable: true,
+    defaultSetting: LabelPreference.hide,
+    severity: 'none',
+    blurs: 'media',
+    adultOnly: true,
+    definedBy: '',
+    behaviors: _mediaLabelBehaviors,
+  ),
+  'sexual': InterpretedLabelValueDefinition(
+    identifier: 'sexual',
+    configurable: true,
+    defaultSetting: LabelPreference.warn,
+    severity: 'none',
+    blurs: 'media',
+    adultOnly: true,
+    definedBy: '',
+    behaviors: _mediaLabelBehaviors,
+  ),
+  'nudity': InterpretedLabelValueDefinition(
+    identifier: 'nudity',
+    configurable: true,
+    defaultSetting: LabelPreference.ignore,
+    severity: 'none',
+    blurs: 'media',
+    definedBy: '',
+    behaviors: _mediaLabelBehaviors,
+  ),
+  'graphic-media': InterpretedLabelValueDefinition(
+    identifier: 'graphic-media',
+    configurable: true,
+    defaultSetting: LabelPreference.warn,
+    severity: 'none',
+    blurs: 'media',
+    adultOnly: true,
+    definedBy: '',
+    behaviors: _mediaLabelBehaviors,
+  ),
+};
+
+const _mediaLabelBehaviors = {
+  LabelTarget.account: {
+    ModerationBehaviorContext.avatar: ModerationBehavior.blur,
+    ModerationBehaviorContext.banner: ModerationBehavior.blur,
+  },
+  LabelTarget.profile: {
+    ModerationBehaviorContext.avatar: ModerationBehavior.blur,
+    ModerationBehaviorContext.banner: ModerationBehavior.blur,
+  },
+  LabelTarget.content: {ModerationBehaviorContext.contentMedia: ModerationBehavior.blur},
+};
+
+InterpretedLabelValueDefinition getInterpretedLabelValueDefinition({
+  required String identifier,
+  required LabelPreference defaultSetting,
+  required String severity,
+  required String blurs,
+  required bool adultOnly,
+  required String definedBy,
+}) {
+  final behavior = _behaviorForDefinition(severity: severity, blurs: blurs);
+  return InterpretedLabelValueDefinition(
+    identifier: identifier,
+    defaultSetting: defaultSetting,
+    severity: severity,
+    blurs: blurs,
+    adultOnly: adultOnly,
+    definedBy: definedBy,
+    behaviors: behavior.isEmpty
+        ? const {}
+        : {LabelTarget.account: behavior, LabelTarget.profile: behavior, LabelTarget.content: behavior},
+  );
+}
+
+Map<ModerationBehaviorContext, ModerationBehavior> _behaviorForDefinition({
+  required String severity,
+  required String blurs,
+}) {
+  final alertBehavior = switch (severity) {
+    'alert' => ModerationBehavior.alert,
+    'inform' => ModerationBehavior.inform,
+    _ => ModerationBehavior.none,
+  };
+  final blurBehavior = blurs == 'content' || blurs == 'media' ? ModerationBehavior.blur : alertBehavior;
+
+  if (blurs == 'media') {
+    return {
+      ModerationBehaviorContext.avatar: blurBehavior,
+      ModerationBehaviorContext.banner: blurBehavior,
+      ModerationBehaviorContext.contentMedia: blurBehavior,
+    };
+  }
+
+  if (blurs == 'content') {
+    return {
+      ModerationBehaviorContext.profileList: blurBehavior,
+      ModerationBehaviorContext.profileView: blurBehavior,
+      ModerationBehaviorContext.avatar: blurBehavior,
+      ModerationBehaviorContext.banner: blurBehavior,
+      ModerationBehaviorContext.displayName: blurBehavior,
+      ModerationBehaviorContext.contentList: blurBehavior,
+      ModerationBehaviorContext.contentView: blurBehavior,
+    };
+  }
+
+  if (alertBehavior == ModerationBehavior.none) {
+    return const {};
+  }
+
+  return {
+    ModerationBehaviorContext.profileList: alertBehavior,
+    ModerationBehaviorContext.profileView: alertBehavior,
+    ModerationBehaviorContext.contentList: alertBehavior,
+    ModerationBehaviorContext.contentView: alertBehavior,
+  };
+}
+
+class ModerationPrefsLabeler {
+  const ModerationPrefsLabeler({required this.did, required this.labels});
+
+  final String did;
+  final Map<String, LabelPreference> labels;
+}
+
+class ModerationPrefs {
+  const ModerationPrefs({
+    this.adultContentEnabled = false,
+    required this.labels,
+    required this.labelers,
+    required this.mutedWords,
+    required this.hiddenPosts,
+  });
+
+  final bool adultContentEnabled;
+  final Map<String, LabelPreference> labels;
+  final List<ModerationPrefsLabeler> labelers;
+  final List<Object> mutedWords;
+  final List<String> hiddenPosts;
+}
+
+class ModerationOpts {
+  const ModerationOpts({required this.prefs, required this.labelDefs, this.userDid});
+
+  final String? userDid;
+  final ModerationPrefs prefs;
+  final Map<String, List<InterpretedLabelValueDefinition>> labelDefs;
+}
+
+class ModerationUI {
+  const ModerationUI({
+    this.noOverride = false,
+    this.filters = const [],
+    this.blurs = const [],
+    this.alerts = const [],
+    this.informs = const [],
+  });
+
+  final bool noOverride;
+  final List<ModerationCause> filters;
+  final List<ModerationCause> blurs;
+  final List<ModerationCause> alerts;
+  final List<ModerationCause> informs;
+
+  bool get filter => filters.isNotEmpty;
+  bool get blur => blurs.isNotEmpty;
+  bool get alert => alerts.isNotEmpty;
+  bool get inform => informs.isNotEmpty;
+}
+
+class ModerationDecision {
+  const ModerationDecision({required this.causes, this.me = false});
+
+  const ModerationDecision.empty() : causes = const [], me = false;
+
+  static ModerationDecision merge(List<ModerationDecision> decisions) {
+    return ModerationDecision(causes: decisions.expand((decision) => decision.causes).toList(growable: false));
+  }
+
+  final List<ModerationCause> causes;
+  final bool me;
+
+  ModerationUI getUI(ModerationBehaviorContext context) {
+    final filters = <ModerationCause>[];
+    final blurs = <ModerationCause>[];
+    final alerts = <ModerationCause>[];
+    final informs = <ModerationCause>[];
+    var noOverride = false;
+
+    for (final cause in causes) {
+      final behavior = cause.behaviorFor(context);
+      if (cause.shouldFilter(context) && !me) {
+        filters.add(cause);
+      }
+      switch (behavior) {
+        case ModerationBehavior.blur:
+          blurs.add(cause);
+          noOverride = noOverride || cause.noOverride;
+        case ModerationBehavior.alert:
+          alerts.add(cause);
+        case ModerationBehavior.inform:
+          informs.add(cause);
+        case ModerationBehavior.none:
+          break;
+      }
+    }
+
+    return ModerationUI(noOverride: noOverride, filters: filters, blurs: blurs, alerts: alerts, informs: informs);
+  }
+}
+
+sealed class ModerationCause {
+  const ModerationCause();
+
+  const factory ModerationCause.blocking({required ModerationCauseBlocking data}) = UModerationCauseBlocking;
+  const factory ModerationCause.blockedBy({required ModerationCauseBlockedBy data}) = UModerationCauseBlockedBy;
+  const factory ModerationCause.blockOther({required ModerationCauseBlockOther data}) = UModerationCauseBlockOther;
+  const factory ModerationCause.label({required ModerationCauseLabel data}) = UModerationCauseLabel;
+  const factory ModerationCause.muted({required ModerationCauseMuted data}) = UModerationCauseMuted;
+  const factory ModerationCause.muteWord({required ModerationCauseMuteWord data}) = UModerationCauseMuteWord;
+  const factory ModerationCause.hidden({required ModerationCauseHidden data}) = UModerationCauseHidden;
+
+  T maybeWhen<T>({
+    T Function(ModerationCauseBlocking data)? blocking,
+    T Function(ModerationCauseBlockedBy data)? blockedBy,
+    T Function(ModerationCauseBlockOther data)? blockOther,
+    T Function(ModerationCauseLabel data)? label,
+    T Function(ModerationCauseMuted data)? muted,
+    T Function(ModerationCauseMuteWord data)? muteWord,
+    T Function(ModerationCauseHidden data)? hidden,
+    required T Function() orElse,
+  }) {
+    return switch (this) {
+      UModerationCauseBlocking(:final data) => blocking?.call(data) ?? orElse(),
+      UModerationCauseBlockedBy(:final data) => blockedBy?.call(data) ?? orElse(),
+      UModerationCauseBlockOther(:final data) => blockOther?.call(data) ?? orElse(),
+      UModerationCauseLabel(:final data) => label?.call(data) ?? orElse(),
+      UModerationCauseMuted(:final data) => muted?.call(data) ?? orElse(),
+      UModerationCauseMuteWord(:final data) => muteWord?.call(data) ?? orElse(),
+      UModerationCauseHidden(:final data) => hidden?.call(data) ?? orElse(),
+    };
+  }
+
+  bool get noOverride => switch (this) {
+    UModerationCauseLabel(:final data) => data.noOverride,
+    UModerationCauseBlocking() || UModerationCauseBlockedBy() || UModerationCauseBlockOther() => true,
+    _ => false,
+  };
+
+  bool shouldFilter(ModerationBehaviorContext context) {
+    return switch (this) {
+      UModerationCauseLabel(:final data) =>
+        data.setting == LabelPreference.hide &&
+            (context.isContentList || (context.isProfileList && data.target == LabelTarget.account)),
+      UModerationCauseBlocking() ||
+      UModerationCauseBlockedBy() ||
+      UModerationCauseBlockOther() ||
+      UModerationCauseMuted() ||
+      UModerationCauseHidden() => context.isProfileList || context.isContentList,
+      UModerationCauseMuteWord() => context.isContentList,
+    };
+  }
+
+  ModerationBehavior behaviorFor(ModerationBehaviorContext context) {
+    return switch (this) {
+      UModerationCauseLabel(:final data) => data.behavior[context] ?? ModerationBehavior.none,
+      UModerationCauseBlocking() ||
+      UModerationCauseBlockedBy() ||
+      UModerationCauseBlockOther() => _blockBehavior[context] ?? ModerationBehavior.none,
+      UModerationCauseMuted() => _muteBehavior[context] ?? ModerationBehavior.none,
+      UModerationCauseMuteWord() => _muteWordBehavior[context] ?? ModerationBehavior.none,
+      UModerationCauseHidden() => _hideBehavior[context] ?? ModerationBehavior.none,
+    };
+  }
+}
+
+class UModerationCauseBlocking extends ModerationCause {
+  const UModerationCauseBlocking({required this.data});
+  final ModerationCauseBlocking data;
+}
+
+class UModerationCauseBlockedBy extends ModerationCause {
+  const UModerationCauseBlockedBy({required this.data});
+  final ModerationCauseBlockedBy data;
+}
+
+class UModerationCauseBlockOther extends ModerationCause {
+  const UModerationCauseBlockOther({required this.data});
+  final ModerationCauseBlockOther data;
+}
+
+class UModerationCauseLabel extends ModerationCause {
+  const UModerationCauseLabel({required this.data});
+  final ModerationCauseLabel data;
+}
+
+class UModerationCauseMuted extends ModerationCause {
+  const UModerationCauseMuted({required this.data});
+  final ModerationCauseMuted data;
+}
+
+class UModerationCauseMuteWord extends ModerationCause {
+  const UModerationCauseMuteWord({required this.data});
+  final ModerationCauseMuteWord data;
+}
+
+class UModerationCauseHidden extends ModerationCause {
+  const UModerationCauseHidden({required this.data});
+  final ModerationCauseHidden data;
+}
+
+class ModerationCauseBlocking {
+  const ModerationCauseBlocking({required this.source});
+  final ModerationCauseSource source;
+}
+
+class ModerationCauseBlockedBy {
+  const ModerationCauseBlockedBy({required this.source});
+  final ModerationCauseSource source;
+}
+
+class ModerationCauseBlockOther {
+  const ModerationCauseBlockOther({required this.source});
+  final ModerationCauseSource source;
+}
+
+class ModerationCauseMuted {
+  const ModerationCauseMuted({required this.source});
+  final ModerationCauseSource source;
+}
+
+class ModerationCauseMuteWord {
+  const ModerationCauseMuteWord({required this.source});
+  final ModerationCauseSource source;
+}
+
+class ModerationCauseHidden {
+  const ModerationCauseHidden({required this.source});
+  final ModerationCauseSource source;
+}
+
+class ModerationCauseLabel {
+  const ModerationCauseLabel({
+    required this.source,
+    required this.label,
+    required this.labelDef,
+    required this.target,
+    required this.setting,
+    required this.behavior,
+    this.noOverride = false,
+  });
+
+  final ModerationCauseSource source;
+  final Label label;
+  final InterpretedLabelValueDefinition labelDef;
+  final LabelTarget target;
+  final LabelPreference setting;
+  final Map<ModerationBehaviorContext, ModerationBehavior> behavior;
+  final bool noOverride;
+}
+
+sealed class ModerationCauseSource {
+  const ModerationCauseSource();
+
+  const factory ModerationCauseSource.user({required ModerationCauseSourceUser data}) = UModerationCauseSourceUser;
+  const factory ModerationCauseSource.labeler({required ModerationCauseSourceLabeler data}) =
+      UModerationCauseSourceLabeler;
+}
+
+class UModerationCauseSourceUser extends ModerationCauseSource {
+  const UModerationCauseSourceUser({required this.data});
+  final ModerationCauseSourceUser data;
+}
+
+class UModerationCauseSourceLabeler extends ModerationCauseSource {
+  const UModerationCauseSourceLabeler({required this.data});
+  final ModerationCauseSourceLabeler data;
+}
+
+class ModerationCauseSourceUser {
+  const ModerationCauseSourceUser();
+}
+
+class ModerationCauseSourceLabeler {
+  const ModerationCauseSourceLabeler({required this.did});
+  final String did;
+}
+
+const _blockBehavior = {
+  ModerationBehaviorContext.profileList: ModerationBehavior.blur,
+  ModerationBehaviorContext.profileView: ModerationBehavior.alert,
+  ModerationBehaviorContext.avatar: ModerationBehavior.blur,
+  ModerationBehaviorContext.banner: ModerationBehavior.blur,
+  ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+  ModerationBehaviorContext.contentView: ModerationBehavior.blur,
+};
+
+const _muteBehavior = {
+  ModerationBehaviorContext.profileList: ModerationBehavior.inform,
+  ModerationBehaviorContext.profileView: ModerationBehavior.alert,
+  ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+  ModerationBehaviorContext.contentView: ModerationBehavior.inform,
+};
+
+const _muteWordBehavior = {
+  ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+  ModerationBehaviorContext.contentView: ModerationBehavior.blur,
+};
+
+const _hideBehavior = {
+  ModerationBehaviorContext.contentList: ModerationBehavior.blur,
+  ModerationBehaviorContext.contentView: ModerationBehavior.blur,
+};
diff --git a/lib/features/moderation/presentation/moderation_ui_helpers.dart b/lib/features/moderation/presentation/moderation_ui_helpers.dart
index 6b98cc7..edb7cb3 100644
--- a/lib/features/moderation/presentation/moderation_ui_helpers.dart
+++ b/lib/features/moderation/presentation/moderation_ui_helpers.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/l10n/app_localizations.dart';
diff --git a/lib/features/moderation/presentation/screens/labeler_detail_screen.dart b/lib/features/moderation/presentation/screens/labeler_detail_screen.dart
index 2142118..2983d2c 100644
--- a/lib/features/moderation/presentation/screens/labeler_detail_screen.dart
+++ b/lib/features/moderation/presentation/screens/labeler_detail_screen.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/labeler/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/moderation/presentation/screens/moderation_settings_screen.dart b/lib/features/moderation/presentation/screens/moderation_settings_screen.dart
index f0561f3..367fe99 100644
--- a/lib/features/moderation/presentation/screens/moderation_settings_screen.dart
+++ b/lib/features/moderation/presentation/screens/moderation_settings_screen.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/app/bsky/labeler/defs.dart';
-import 'package:poptart_lex/app/bsky/labeler/get_services.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/defs.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/get_services.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/moderation/presentation/widgets/moderated_avatar.dart b/lib/features/moderation/presentation/widgets/moderated_avatar.dart
index 386dce5..8a57ac1 100644
--- a/lib/features/moderation/presentation/widgets/moderated_avatar.dart
+++ b/lib/features/moderation/presentation/widgets/moderated_avatar.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/cache/lazurite_image_cache.dart';
diff --git a/lib/features/moderation/presentation/widgets/moderated_blur_overlay.dart b/lib/features/moderation/presentation/widgets/moderated_blur_overlay.dart
index 5362644..99cc269 100644
--- a/lib/features/moderation/presentation/widgets/moderated_blur_overlay.dart
+++ b/lib/features/moderation/presentation/widgets/moderated_blur_overlay.dart
@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
 import 'package:lazurite/core/theme/theme_extensions.dart';
diff --git a/lib/features/moderation/presentation/widgets/moderation_badge_row.dart b/lib/features/moderation/presentation/widgets/moderation_badge_row.dart
index afd65dc..7a77cb3 100644
--- a/lib/features/moderation/presentation/widgets/moderation_badge_row.dart
+++ b/lib/features/moderation/presentation/widgets/moderation_badge_row.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
 import 'package:lazurite/core/theme/theme_extensions.dart';
diff --git a/lib/features/notifications/bloc/notification_bloc.dart b/lib/features/notifications/bloc/notification_bloc.dart
index b7cdb65..1324f32 100644
--- a/lib/features/notifications/bloc/notification_bloc.dart
+++ b/lib/features/notifications/bloc/notification_bloc.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
diff --git a/lib/features/notifications/data/notification_repository.dart b/lib/features/notifications/data/notification_repository.dart
index 689586d..0399a3b 100644
--- a/lib/features/notifications/data/notification_repository.dart
+++ b/lib/features/notifications/data/notification_repository.dart
@@ -1,6 +1,6 @@
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart';
-import 'package:poptart_lex/app/bsky/notification/register_push.dart';
-import 'package:poptart_lex/app/bsky/notification/unregister_push.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart';
+import 'package:bluesky_poptart/app/bsky/notification/register_push.dart';
+import 'package:bluesky_poptart/app/bsky/notification/unregister_push.dart';
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
 import 'package:lazurite/core/network/app_view_request_context.dart';
diff --git a/lib/features/notifications/domain/notification_domain_service.dart b/lib/features/notifications/domain/notification_domain_service.dart
index 0e12582..eea7120 100644
--- a/lib/features/notifications/domain/notification_domain_service.dart
+++ b/lib/features/notifications/domain/notification_domain_service.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart';
 import 'package:lazurite/core/database/app_database.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
 import 'package:lazurite/features/notifications/data/notification_repository.dart';
diff --git a/lib/features/notifications/domain/notification_local_mappers.dart b/lib/features/notifications/domain/notification_local_mappers.dart
index 53d9020..8eb40c3 100644
--- a/lib/features/notifications/domain/notification_local_mappers.dart
+++ b/lib/features/notifications/domain/notification_local_mappers.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:ui';
 
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart';
 import 'package:crypto/crypto.dart';
 import 'package:lazurite/core/l10n/app_localizations.dart';
 import 'package:lazurite/features/notifications/domain/notification_local_models.dart';
diff --git a/lib/features/notifications/domain/notification_reason_utils.dart b/lib/features/notifications/domain/notification_reason_utils.dart
index b758b46..a38ca21 100644
--- a/lib/features/notifications/domain/notification_reason_utils.dart
+++ b/lib/features/notifications/domain/notification_reason_utils.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'dart:ui';
 
 import 'package:lazurite/core/l10n/app_localizations.dart';
diff --git a/lib/features/notifications/presentation/widgets/grouped_notification_list_item.dart b/lib/features/notifications/presentation/widgets/grouped_notification_list_item.dart
index b6c8250..2f83566 100644
--- a/lib/features/notifications/presentation/widgets/grouped_notification_list_item.dart
+++ b/lib/features/notifications/presentation/widgets/grouped_notification_list_item.dart
@@ -1,6 +1,6 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart' as actor;
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart' as actor;
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart' hide Notification;
 import 'package:go_router/go_router.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/notifications/presentation/widgets/notification_list_item.dart b/lib/features/notifications/presentation/widgets/notification_list_item.dart
index 50093d4..b384371 100644
--- a/lib/features/notifications/presentation/widgets/notification_list_item.dart
+++ b/lib/features/notifications/presentation/widgets/notification_list_item.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart' hide Notification;
 import 'package:go_router/go_router.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/notifications/presentation/widgets/notifications_pane.dart b/lib/features/notifications/presentation/widgets/notifications_pane.dart
index 4177fdc..ce8a50a 100644
--- a/lib/features/notifications/presentation/widgets/notifications_pane.dart
+++ b/lib/features/notifications/presentation/widgets/notifications_pane.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'dart:async';
 
 import 'package:flutter/material.dart';
diff --git a/lib/features/profile/bloc/profile_bloc.dart b/lib/features/profile/bloc/profile_bloc.dart
index 1cdaa79..09592da 100644
--- a/lib/features/profile/bloc/profile_bloc.dart
+++ b/lib/features/profile/bloc/profile_bloc.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/profile/data/profile_repository.dart';
diff --git a/lib/features/profile/cubit/profile_connections_cubit.dart b/lib/features/profile/cubit/profile_connections_cubit.dart
index cf2e37b..14968f7 100644
--- a/lib/features/profile/cubit/profile_connections_cubit.dart
+++ b/lib/features/profile/cubit/profile_connections_cubit.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:fuzzywuzzy/fuzzywuzzy.dart' as fuzzywuzzy;
diff --git a/lib/features/profile/cubit/profile_context_cubit.dart b/lib/features/profile/cubit/profile_context_cubit.dart
index d5aaea6..8608040 100644
--- a/lib/features/profile/cubit/profile_context_cubit.dart
+++ b/lib/features/profile/cubit/profile_context_cubit.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
diff --git a/lib/features/profile/cubit/suggested_follows_cubit.dart b/lib/features/profile/cubit/suggested_follows_cubit.dart
index 8c2e3bc..6507186 100644
--- a/lib/features/profile/cubit/suggested_follows_cubit.dart
+++ b/lib/features/profile/cubit/suggested_follows_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/profile/data/profile_repository.dart';
diff --git a/lib/features/profile/data/follow_audit_repository.dart b/lib/features/profile/data/follow_audit_repository.dart
index 29fc83c..1a17aef 100644
--- a/lib/features/profile/data/follow_audit_repository.dart
+++ b/lib/features/profile/data/follow_audit_repository.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/follow.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/follow.dart';
 import 'package:poptart_lex/com/atproto/repo/apply_writes.dart';
 import 'package:equatable/equatable.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
diff --git a/lib/features/profile/data/profile_context_repository.dart b/lib/features/profile/data/profile_context_repository.dart
index 0cb4c18..f51ae37 100644
--- a/lib/features/profile/data/profile_context_repository.dart
+++ b/lib/features/profile/data/profile_context_repository.dart
@@ -1,6 +1,6 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/block.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/block.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:poptart_lex/com/atproto/repo/list_records.dart';
 import 'package:equatable/equatable.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
diff --git a/lib/features/profile/data/profile_repository.dart b/lib/features/profile/data/profile_repository.dart
index d42c59d..6c10ab7 100644
--- a/lib/features/profile/data/profile_repository.dart
+++ b/lib/features/profile/data/profile_repository.dart
@@ -3,10 +3,10 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:poptart_core/poptart_core.dart' as atp_core;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/profile.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/like.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/profile.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/like.dart';
 import 'package:poptart_lex/com/atproto/repo/list_records.dart';
 import 'package:characters/characters.dart';
 import 'package:lazurite/core/cache/poptart_cache_codecs.dart';
diff --git a/lib/features/profile/presentation/profile_connections_screen.dart b/lib/features/profile/presentation/profile_connections_screen.dart
index 3303919..aa36008 100644
--- a/lib/features/profile/presentation/profile_connections_screen.dart
+++ b/lib/features/profile/presentation/profile_connections_screen.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/profile/presentation/profile_context_screen.dart b/lib/features/profile/presentation/profile_context_screen.dart
index 691eb27..9240f0c 100644
--- a/lib/features/profile/presentation/profile_context_screen.dart
+++ b/lib/features/profile/presentation/profile_context_screen.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/profile/presentation/profile_edit_screen.dart b/lib/features/profile/presentation/profile_edit_screen.dart
index 0d98025..03bd8cc 100644
--- a/lib/features/profile/presentation/profile_edit_screen.dart
+++ b/lib/features/profile/presentation/profile_edit_screen.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
diff --git a/lib/features/profile/presentation/profile_screen.dart b/lib/features/profile/presentation/profile_screen.dart
index 1931105..74a1c7b 100644
--- a/lib/features/profile/presentation/profile_screen.dart
+++ b/lib/features/profile/presentation/profile_screen.dart
@@ -1,7 +1,7 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_animate/flutter_animate.dart';
diff --git a/lib/features/profile/presentation/widgets/profile_liked_posts_pane.dart b/lib/features/profile/presentation/widgets/profile_liked_posts_pane.dart
index 71e82fe..657e2b7 100644
--- a/lib/features/profile/presentation/widgets/profile_liked_posts_pane.dart
+++ b/lib/features/profile/presentation/widgets/profile_liked_posts_pane.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/profile/presentation/widgets/suggested_follows_list.dart b/lib/features/profile/presentation/widgets/suggested_follows_list.dart
index dbfee2a..9a8073d 100644
--- a/lib/features/profile/presentation/widgets/suggested_follows_list.dart
+++ b/lib/features/profile/presentation/widgets/suggested_follows_list.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
diff --git a/lib/features/search/bloc/search_bloc.dart b/lib/features/search/bloc/search_bloc.dart
index ee749e9..f4f804d 100644
--- a/lib/features/search/bloc/search_bloc.dart
+++ b/lib/features/search/bloc/search_bloc.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/database/app_database.dart';
diff --git a/lib/features/search/cubit/hashtag_cubit.dart b/lib/features/search/cubit/hashtag_cubit.dart
index 4970142..d9e556f 100644
--- a/lib/features/search/cubit/hashtag_cubit.dart
+++ b/lib/features/search/cubit/hashtag_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/search/data/search_repository.dart';
diff --git a/lib/features/search/cubit/topic_cubit.dart b/lib/features/search/cubit/topic_cubit.dart
index 805f078..75a7003 100644
--- a/lib/features/search/cubit/topic_cubit.dart
+++ b/lib/features/search/cubit/topic_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/search/data/search_repository.dart';
diff --git a/lib/features/search/data/hashtag_utils.dart b/lib/features/search/data/hashtag_utils.dart
index 762a231..bef9717 100644
--- a/lib/features/search/data/hashtag_utils.dart
+++ b/lib/features/search/data/hashtag_utils.dart
@@ -1,6 +1,6 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
 import 'package:poptart_bluesky_text/poptart_bluesky_text.dart';
 import 'package:lazurite/shared/utils/parse_utils.dart';
 
diff --git a/lib/features/search/data/post_text_extractor.dart b/lib/features/search/data/post_text_extractor.dart
index 26866e2..6ec6fa1 100644
--- a/lib/features/search/data/post_text_extractor.dart
+++ b/lib/features/search/data/post_text_extractor.dart
@@ -1,6 +1,6 @@
-import 'package:poptart_lex/app/bsky/embed/record_with_media.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record_with_media.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
 
 /// Extracts a single searchable string from a [PostView] for embedding.
 ///
diff --git a/lib/features/search/data/search_repository.dart b/lib/features/search/data/search_repository.dart
index e2809e3..ae2a801 100644
--- a/lib/features/search/data/search_repository.dart
+++ b/lib/features/search/data/search_repository.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/search_posts.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/search_posts.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter/foundation.dart';
 import 'package:lazurite/core/network/app_view_fallback_service.dart';
 import 'package:lazurite/core/network/app_view_request_context.dart';
diff --git a/lib/features/search/presentation/hashtag_screen.dart b/lib/features/search/presentation/hashtag_screen.dart
index 4199a75..df92553 100644
--- a/lib/features/search/presentation/hashtag_screen.dart
+++ b/lib/features/search/presentation/hashtag_screen.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/search/presentation/search_screen.dart b/lib/features/search/presentation/search_screen.dart
index 2d26777..6062d8c 100644
--- a/lib/features/search/presentation/search_screen.dart
+++ b/lib/features/search/presentation/search_screen.dart
@@ -1,6 +1,6 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/search/presentation/semantic_search_tab.dart b/lib/features/search/presentation/semantic_search_tab.dart
index 0e4a2a2..25c4d34 100644
--- a/lib/features/search/presentation/semantic_search_tab.dart
+++ b/lib/features/search/presentation/semantic_search_tab.dart
@@ -1,6 +1,6 @@
 import 'dart:async';
 
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/core/cache/poptart_cache_codecs.dart';
diff --git a/lib/features/search/presentation/topic_screen.dart b/lib/features/search/presentation/topic_screen.dart
index 6ac9e37..6b19380 100644
--- a/lib/features/search/presentation/topic_screen.dart
+++ b/lib/features/search/presentation/topic_screen.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/auth/bloc/auth_bloc.dart';
diff --git a/lib/features/search/presentation/widgets/follow_button.dart b/lib/features/search/presentation/widgets/follow_button.dart
index 72e7eec..87ccaeb 100644
--- a/lib/features/search/presentation/widgets/follow_button.dart
+++ b/lib/features/search/presentation/widgets/follow_button.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/connectivity/connectivity_helpers.dart';
diff --git a/lib/features/settings/data/video_repository.dart b/lib/features/settings/data/video_repository.dart
index e3372ee..88ce0e9 100644
--- a/lib/features/settings/data/video_repository.dart
+++ b/lib/features/settings/data/video_repository.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/video/get_upload_limits.dart';
+import 'package:bluesky_poptart/app/bsky/video/get_upload_limits.dart';
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
 
 abstract interface class VideoUploadLimitsApi {
diff --git a/lib/features/starter_packs/bloc/starter_pack_bloc.dart b/lib/features/starter_packs/bloc/starter_pack_bloc.dart
index 80a110f..68fc62e 100644
--- a/lib/features/starter_packs/bloc/starter_pack_bloc.dart
+++ b/lib/features/starter_packs/bloc/starter_pack_bloc.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/starter_packs/data/starter_pack_repository.dart';
diff --git a/lib/features/starter_packs/cubit/actor_starter_packs_cubit.dart b/lib/features/starter_packs/cubit/actor_starter_packs_cubit.dart
index a5b65bb..0ee9708 100644
--- a/lib/features/starter_packs/cubit/actor_starter_packs_cubit.dart
+++ b/lib/features/starter_packs/cubit/actor_starter_packs_cubit.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:lazurite/features/starter_packs/data/starter_pack_repository.dart';
diff --git a/lib/features/starter_packs/data/starter_pack_repository.dart b/lib/features/starter_packs/data/starter_pack_repository.dart
index 7ba3c69..8d18517 100644
--- a/lib/features/starter_packs/data/starter_pack_repository.dart
+++ b/lib/features/starter_packs/data/starter_pack_repository.dart
@@ -1,7 +1,7 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart' show GeneratorView;
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/list.dart';
-import 'package:poptart_lex/app/bsky/graph/starterpack.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart' show GeneratorView;
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/list.dart';
+import 'package:bluesky_poptart/app/bsky/graph/starterpack.dart';
 import 'package:lazurite/core/logging/app_logger.dart';
 import 'package:lazurite/core/network/app_view_request_context.dart';
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
diff --git a/lib/features/starter_packs/presentation/create_edit_starter_pack_screen.dart b/lib/features/starter_packs/presentation/create_edit_starter_pack_screen.dart
index fd1cd43..062163e 100644
--- a/lib/features/starter_packs/presentation/create_edit_starter_pack_screen.dart
+++ b/lib/features/starter_packs/presentation/create_edit_starter_pack_screen.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
diff --git a/lib/features/starter_packs/presentation/starter_pack_detail_screen.dart b/lib/features/starter_packs/presentation/starter_pack_detail_screen.dart
index f96fd4e..4d20fb7 100644
--- a/lib/features/starter_packs/presentation/starter_pack_detail_screen.dart
+++ b/lib/features/starter_packs/presentation/starter_pack_detail_screen.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/feed/defs.dart' show GeneratorView;
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart' show GeneratorView;
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
 import 'package:flutter/material.dart' hide ListView;
 import 'package:flutter/material.dart' as material show ListView;
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/lib/features/starter_packs/presentation/widgets/starter_pack_card.dart b/lib/features/starter_packs/presentation/widgets/starter_pack_card.dart
index 890c634..446bcc8 100644
--- a/lib/features/starter_packs/presentation/widgets/starter_pack_card.dart
+++ b/lib/features/starter_packs/presentation/widgets/starter_pack_card.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/l10n/l10n.dart';
 import 'package:lazurite/core/theme/theme_extensions.dart';
diff --git a/lib/features/typeahead/data/typeahead_repository.dart b/lib/features/typeahead/data/typeahead_repository.dart
index 1736643..35ba818 100644
--- a/lib/features/typeahead/data/typeahead_repository.dart
+++ b/lib/features/typeahead/data/typeahead_repository.dart
@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io' as io;
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:http/http.dart' as http;
 import 'package:lazurite/core/logging/app_logger.dart';
 import 'package:lazurite/core/network/app_view_request_context.dart';
diff --git a/lib/features/typeahead/data/typeahead_result.dart b/lib/features/typeahead/data/typeahead_result.dart
index 16de1f5..797e704 100644
--- a/lib/features/typeahead/data/typeahead_result.dart
+++ b/lib/features/typeahead/data/typeahead_result.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:equatable/equatable.dart';
 
 class TypeaheadResult extends Equatable {
diff --git a/lib/shared/presentation/helpers/notification_icon_mapper.dart b/lib/shared/presentation/helpers/notification_icon_mapper.dart
index e54649a..e825198 100644
--- a/lib/shared/presentation/helpers/notification_icon_mapper.dart
+++ b/lib/shared/presentation/helpers/notification_icon_mapper.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'package:flutter/material.dart';
 
 class NotificationIconStyle {
diff --git a/lib/shared/presentation/widgets/profile_avatar.dart b/lib/shared/presentation/widgets/profile_avatar.dart
index 6398cbe..38f8f4b 100644
--- a/lib/shared/presentation/widgets/profile_avatar.dart
+++ b/lib/shared/presentation/widgets/profile_avatar.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:cached_network_image/cached_network_image.dart';
 import 'package:flutter/material.dart';
 import 'package:lazurite/core/cache/lazurite_image_cache.dart';
diff --git a/lib/shared/utils/format_utils.dart b/lib/shared/utils/format_utils.dart
index c3d87e0..e2ed073 100644
--- a/lib/shared/utils/format_utils.dart
+++ b/lib/shared/utils/format_utils.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:intl/intl.dart';
 
 /// Returns up to two initials from a display value.
diff --git a/lib/shared/utils/parse_utils.dart b/lib/shared/utils/parse_utils.dart
index 930b397..c146c4c 100644
--- a/lib/shared/utils/parse_utils.dart
+++ b/lib/shared/utils/parse_utils.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
 
 FeedPostRecord? tryParseRecord(Map<String, dynamic> record) {
   try {
diff --git a/pubspec.lock b/pubspec.lock
index dc3c47f..05692e0 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -65,6 +65,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "10.0.0"
+  bluesky_poptart:
+    dependency: "direct main"
+    description:
+      name: bluesky_poptart
+      sha256: c55e2ac06fcf8f90aac18c90ef280216c48da1bbf4bac9d84b01bb69079b6b5c
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   boolean_selector:
     dependency: transitive
     description:
@@ -1021,6 +1029,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.0"
+  ozone_poptart:
+    dependency: "direct main"
+    description:
+      name: ozone_poptart
+      sha256: "2764e4a75d9e2119b00717e30975b3b2f3983c4c7f1079e6ee24bba40608a38b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
   package_config:
     dependency: transitive
     description:
@@ -1213,14 +1229,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.1.0"
-  poptart_bluesky_moderation:
-    dependency: "direct main"
-    description:
-      name: poptart_bluesky_moderation
-      sha256: d9d4cdcd04e5874edc8eadf0cd39f5e6e0e23a7d362a67876430ddb39c8ccf79
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.1.0"
   poptart_bluesky_text:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index c91e7c0..f9be8ac 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,9 +16,10 @@ dependencies:
   poptart_core: ^0.1.0
   poptart_oauth: ^0.1.0
   poptart_lex: ^0.1.0
+  bluesky_poptart: ^0.1.0
+  ozone_poptart: ^0.1.0
   poptart_xrpc: ^0.1.0
   poptart_bluesky_text: ^0.1.0
-  poptart_bluesky_moderation: ^0.1.0
   flutter_bloc: ^9.1.1
   drift: ^2.24.0
   drift_flutter: ^0.2.8
diff --git a/test/core/cache/poptart_cache_codecs_test.dart b/test/core/cache/poptart_cache_codecs_test.dart
index f025c9d..5af2547 100644
--- a/test/core/cache/poptart_cache_codecs_test.dart
+++ b/test/core/cache/poptart_cache_codecs_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/core/cache/poptart_cache_codecs.dart';
 
diff --git a/test/core/network/poptart_client_adapter_test.dart b/test/core/network/poptart_client_adapter_test.dart
index 615bc12..7821717 100644
--- a/test/core/network/poptart_client_adapter_test.dart
+++ b/test/core/network/poptart_client_adapter_test.dart
@@ -3,10 +3,10 @@ import 'dart:convert';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
-import 'package:poptart_lex/app/bsky/actor.dart' as actor_methods;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed.dart' as feed_methods;
-import 'package:poptart_lex/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/actor.dart' as actor_methods;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed.dart' as feed_methods;
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
 import 'package:poptart_lex/com/atproto/repo/apply_writes.dart';
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 
diff --git a/test/core/router/app_router_test.dart b/test/core/router/app_router_test.dart
index 1ec7815..7431e48 100644
--- a/test/core/router/app_router_test.dart
+++ b/test/core/router/app_router_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/alerts/presentation/alerts_screen_test.dart b/test/features/alerts/presentation/alerts_screen_test.dart
index a8a929f..79eb404 100644
--- a/test/features/alerts/presentation/alerts_screen_test.dart
+++ b/test/features/alerts/presentation/alerts_screen_test.dart
@@ -1,8 +1,8 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart' as app_actor;
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
-import 'package:poptart_lex/chat/bsky/actor/defs.dart' as chat_actor;
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart' as app_actor;
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/chat/bsky/actor/defs.dart' as chat_actor;
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/test/features/compose/bloc/compose_bloc_test.dart b/test/features/compose/bloc/compose_bloc_test.dart
index e4d2b3f..f2aa0fc 100644
--- a/test/features/compose/bloc/compose_bloc_test.dart
+++ b/test/features/compose/bloc/compose_bloc_test.dart
@@ -6,9 +6,9 @@ import 'package:lazurite/core/database/app_database.dart';
 import 'package:lazurite/features/compose/bloc/compose_bloc.dart';
 import 'package:mocktail/mocktail.dart';
 import 'package:poptart_core/poptart_core.dart' show Blob, BlobRef;
-import 'package:poptart_lex/app/bsky/embed/external.dart';
-import 'package:poptart_lex/app/bsky/embed/record_with_media.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/embed/external.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record_with_media.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
 
 class MockAppDatabase extends Mock implements AppDatabase {}
 
diff --git a/test/features/compose/presentation/compose_screen_test.dart b/test/features/compose/presentation/compose_screen_test.dart
index 5a96329..43fba0e 100644
--- a/test/features/compose/presentation/compose_screen_test.dart
+++ b/test/features/compose/presentation/compose_screen_test.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/devtools/cubit/dev_tools_cubit_test.dart b/test/features/devtools/cubit/dev_tools_cubit_test.dart
index 6ee53bc..9ef926b 100644
--- a/test/features/devtools/cubit/dev_tools_cubit_test.dart
+++ b/test/features/devtools/cubit/dev_tools_cubit_test.dart
@@ -3,7 +3,7 @@ import 'package:poptart_lex/com/atproto/repo/describe_repo.dart';
 import 'package:poptart_lex/com/atproto/repo/get_record.dart';
 import 'package:poptart_lex/com/atproto/repo/list_records.dart';
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/devtools/cubit/dev_tools_cubit.dart';
diff --git a/test/features/devtools/cubit/dev_tools_state_test.dart b/test/features/devtools/cubit/dev_tools_state_test.dart
index 89cd01a..95a82e3 100644
--- a/test/features/devtools/cubit/dev_tools_state_test.dart
+++ b/test/features/devtools/cubit/dev_tools_state_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_lex/com/atproto/repo/list_records.dart';
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/devtools/cubit/dev_tools_cubit.dart';
 
diff --git a/test/features/devtools/presentation/dev_tools_screen_test.dart b/test/features/devtools/presentation/dev_tools_screen_test.dart
index 6f49e22..fb0d4a7 100644
--- a/test/features/devtools/presentation/dev_tools_screen_test.dart
+++ b/test/features/devtools/presentation/dev_tools_screen_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_lex/com/atproto/repo/list_records.dart';
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/test/features/feed/bloc/feed_bloc_test.dart b/test/features/feed/bloc/feed_bloc_test.dart
index b3768f8..4324a12 100644
--- a/test/features/feed/bloc/feed_bloc_test.dart
+++ b/test/features/feed/bloc/feed_bloc_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart';
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/feed/bloc/feed_bloc.dart';
 import 'package:lazurite/features/feed/data/feed_repository.dart';
diff --git a/test/features/feed/cubit/feed_preferences_cubit_test.dart b/test/features/feed/cubit/feed_preferences_cubit_test.dart
index 71d00c3..97d941f 100644
--- a/test/features/feed/cubit/feed_preferences_cubit_test.dart
+++ b/test/features/feed/cubit/feed_preferences_cubit_test.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:poptart_core/poptart_core.dart';
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:drift/drift.dart' hide isNotNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/cubit/post_thread_cubit_test.dart b/test/features/feed/cubit/post_thread_cubit_test.dart
index 4537a5c..eea5abd 100644
--- a/test/features/feed/cubit/post_thread_cubit_test.dart
+++ b/test/features/feed/cubit/post_thread_cubit_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/feed/cubit/post_thread_cubit.dart';
diff --git a/test/features/feed/cubit/saved_posts_cubit_test.dart b/test/features/feed/cubit/saved_posts_cubit_test.dart
index 52461af..7e7b2f1 100644
--- a/test/features/feed/cubit/saved_posts_cubit_test.dart
+++ b/test/features/feed/cubit/saved_posts_cubit_test.dart
@@ -1,9 +1,9 @@
 import 'package:poptart_lex/com/atproto/repo/strong_ref.dart';
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/bookmark/defs.dart';
-import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/defs.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/get_bookmarks.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:drift/drift.dart' hide isNull, isNotNull;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/data/feed_repository_cache_test.dart b/test/features/feed/data/feed_repository_cache_test.dart
index 2ba46d9..9faaeac 100644
--- a/test/features/feed/data/feed_repository_cache_test.dart
+++ b/test/features/feed/data/feed_repository_cache_test.dart
@@ -2,9 +2,9 @@ import 'dart:collection';
 import 'dart:convert';
 
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_timeline.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_timeline.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
diff --git a/test/features/feed/data/feed_repository_test.dart b/test/features/feed/data/feed_repository_test.dart
index 2f44b45..f0efd38 100644
--- a/test/features/feed/data/feed_repository_test.dart
+++ b/test/features/feed/data/feed_repository_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/feed/data/feed_repository.dart';
 import 'package:mocktail/mocktail.dart';
diff --git a/test/features/feed/data/liked_posts_repository_test.dart b/test/features/feed/data/liked_posts_repository_test.dart
index 505cb0b..6d0775e 100644
--- a/test/features/feed/data/liked_posts_repository_test.dart
+++ b/test/features/feed/data/liked_posts_repository_test.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_actor_likes.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_actor_likes.dart';
 import 'package:drift/drift.dart' show Value;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/data/post_action_repository_test.dart b/test/features/feed/data/post_action_repository_test.dart
index 7ae7f54..c4db857 100644
--- a/test/features/feed/data/post_action_repository_test.dart
+++ b/test/features/feed/data/post_action_repository_test.dart
@@ -1,8 +1,8 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart';
-import 'package:poptart_lex/app/bsky/feed/get_likes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_quotes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/get_bookmarks.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_likes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_quotes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_reposted_by.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/feed/data/post_action_repository.dart';
 
diff --git a/test/features/feed/data/post_thread_repository_cache_test.dart b/test/features/feed/data/post_thread_repository_cache_test.dart
index 398cbe7..77f081f 100644
--- a/test/features/feed/data/post_thread_repository_cache_test.dart
+++ b/test/features/feed/data/post_thread_repository_cache_test.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_post_thread.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_post_thread.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
diff --git a/test/features/feed/data/post_thread_repository_test.dart b/test/features/feed/data/post_thread_repository_test.dart
index 4d555ca..c4ff4b2 100644
--- a/test/features/feed/data/post_thread_repository_test.dart
+++ b/test/features/feed/data/post_thread_repository_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/feed/data/post_thread_repository.dart';
 import 'package:mocktail/mocktail.dart';
diff --git a/test/features/feed/data/trending_join_test.dart b/test/features/feed/data/trending_join_test.dart
index f688363..818f2e8 100644
--- a/test/features/feed/data/trending_join_test.dart
+++ b/test/features/feed/data/trending_join_test.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/unspecced/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/unspecced/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/feed/data/trending_join.dart';
 
diff --git a/test/features/feed/presentation/compact_post_card_test.dart b/test/features/feed/presentation/compact_post_card_test.dart
index f9eef8d..cbac1f1 100644
--- a/test/features/feed/presentation/compact_post_card_test.dart
+++ b/test/features/feed/presentation/compact_post_card_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/core/theme/app_theme.dart';
diff --git a/test/features/feed/presentation/feed_detail_screen_test.dart b/test/features/feed/presentation/feed_detail_screen_test.dart
index 1813390..c96a52d 100644
--- a/test/features/feed/presentation/feed_detail_screen_test.dart
+++ b/test/features/feed/presentation/feed_detail_screen_test.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:poptart_core/poptart_core.dart';
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/grid_post_card_test.dart b/test/features/feed/presentation/grid_post_card_test.dart
index 45a9452..122880f 100644
--- a/test/features/feed/presentation/grid_post_card_test.dart
+++ b/test/features/feed/presentation/grid_post_card_test.dart
@@ -1,9 +1,9 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/embed/external.dart';
-import 'package:poptart_lex/app/bsky/embed/images.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/embed/external.dart';
+import 'package:bluesky_poptart/app/bsky/embed/images.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:go_router/go_router.dart';
diff --git a/test/features/feed/presentation/home_feed_screen_test.dart b/test/features/feed/presentation/home_feed_screen_test.dart
index 7cfb2f1..eda0ebd 100644
--- a/test/features/feed/presentation/home_feed_screen_test.dart
+++ b/test/features/feed/presentation/home_feed_screen_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/post_card_test.dart b/test/features/feed/presentation/post_card_test.dart
index 76d6a61..b90e186 100644
--- a/test/features/feed/presentation/post_card_test.dart
+++ b/test/features/feed/presentation/post_card_test.dart
@@ -1,14 +1,14 @@
 import 'dart:convert';
 
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/embed/external.dart';
-import 'package:poptart_lex/app/bsky/embed/images.dart';
-import 'package:poptart_lex/app/bsky/embed/record.dart';
-import 'package:poptart_lex/app/bsky/embed/record_with_media.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/embed/external.dart';
+import 'package:bluesky_poptart/app/bsky/embed/images.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record_with_media.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:go_router/go_router.dart';
diff --git a/test/features/feed/presentation/post_card_with_actions_test.dart b/test/features/feed/presentation/post_card_with_actions_test.dart
index 04837b6..e441ea5 100644
--- a/test/features/feed/presentation/post_card_with_actions_test.dart
+++ b/test/features/feed/presentation/post_card_with_actions_test.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/test/features/feed/presentation/post_interactions_sheet_test.dart b/test/features/feed/presentation/post_interactions_sheet_test.dart
index 3f8d6bf..567c719 100644
--- a/test/features/feed/presentation/post_interactions_sheet_test.dart
+++ b/test/features/feed/presentation/post_interactions_sheet_test.dart
@@ -1,9 +1,9 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart';
-import 'package:poptart_lex/app/bsky/feed/get_likes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_quotes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/get_bookmarks.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_likes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_quotes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_reposted_by.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/core/theme/app_theme.dart';
diff --git a/test/features/feed/presentation/post_quote_repost_sheet_test.dart b/test/features/feed/presentation/post_quote_repost_sheet_test.dart
index da251da..5b689c5 100644
--- a/test/features/feed/presentation/post_quote_repost_sheet_test.dart
+++ b/test/features/feed/presentation/post_quote_repost_sheet_test.dart
@@ -1,10 +1,10 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_likes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_quotes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/get_bookmarks.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_likes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_quotes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_reposted_by.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/core/theme/app_theme.dart';
diff --git a/test/features/feed/presentation/post_thread_edit_flow_test.dart b/test/features/feed/presentation/post_thread_edit_flow_test.dart
index 2c177a1..bc991ac 100644
--- a/test/features/feed/presentation/post_thread_edit_flow_test.dart
+++ b/test/features/feed/presentation/post_thread_edit_flow_test.dart
@@ -1,11 +1,11 @@
 import 'package:poptart_core/poptart_core.dart';
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_likes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_quotes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_reposted_by.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/get_bookmarks.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_likes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_quotes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_reposted_by.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/post_thread_screen_test.dart b/test/features/feed/presentation/post_thread_screen_test.dart
index b7d9cb1..edf2ddb 100644
--- a/test/features/feed/presentation/post_thread_screen_test.dart
+++ b/test/features/feed/presentation/post_thread_screen_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/test/features/feed/presentation/saved_posts_screen_test.dart b/test/features/feed/presentation/saved_posts_screen_test.dart
index d04fdf4..e5ab798 100644
--- a/test/features/feed/presentation/saved_posts_screen_test.dart
+++ b/test/features/feed/presentation/saved_posts_screen_test.dart
@@ -2,13 +2,13 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:poptart_lex/app/bsky/bookmark/get_bookmarks.dart';
+import 'package:bluesky_poptart/app/bsky/bookmark/get_bookmarks.dart';
 import 'package:lazurite/core/database/app_database.dart';
 import 'package:lazurite/features/connectivity/cubit/connectivity_cubit.dart';
 import 'package:lazurite/features/feed/cubit/post_action_cache.dart';
diff --git a/test/features/feed/presentation/trending_screen_test.dart b/test/features/feed/presentation/trending_screen_test.dart
index e6c816d..94bc273 100644
--- a/test/features/feed/presentation/trending_screen_test.dart
+++ b/test/features/feed/presentation/trending_screen_test.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/unspecced/defs.dart';
+import 'package:bluesky_poptart/app/bsky/unspecced/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/feed/presentation/widgets/facet_text_test.dart b/test/features/feed/presentation/widgets/facet_text_test.dart
index adef6a2..fe44a4c 100644
--- a/test/features/feed/presentation/widgets/facet_text_test.dart
+++ b/test/features/feed/presentation/widgets/facet_text_test.dart
@@ -1,6 +1,6 @@
 import 'dart:convert';
 
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:go_router/go_router.dart';
diff --git a/test/features/lists/bloc/list_bloc_test.dart b/test/features/lists/bloc/list_bloc_test.dart
index 32c407d..d7b8e9f 100644
--- a/test/features/lists/bloc/list_bloc_test.dart
+++ b/test/features/lists/bloc/list_bloc_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri, Blob, BlobRef;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/lists/bloc/list_bloc.dart';
 import 'package:lazurite/features/lists/data/list_repository.dart';
@@ -239,7 +239,11 @@ void main() {
             mimeType: any(named: 'mimeType'),
           ),
         ).thenAnswer(
-          (_) async => const Blob(ref: BlobRef(link: 'bafkreinewavatarblob'), mimeType: 'image/jpeg', size: 3),
+          (_) async => const Blob(
+            ref: BlobRef(link: 'bafkreinewavatarblob'),
+            mimeType: 'image/jpeg',
+            size: 3,
+          ),
         );
         when(
           () => mockListRepository.updateList(
@@ -274,7 +278,11 @@ void main() {
             name: any(named: 'name'),
             purpose: any(named: 'purpose'),
             description: any(named: 'description'),
-            avatarBlob: const Blob(ref: BlobRef(link: 'bafkreinewavatarblob'), mimeType: 'image/jpeg', size: 3),
+            avatarBlob: const Blob(
+              ref: BlobRef(link: 'bafkreinewavatarblob'),
+              mimeType: 'image/jpeg',
+              size: 3,
+            ),
           ),
         ).called(1);
       },
diff --git a/test/features/lists/bloc/list_feed_bloc_test.dart b/test/features/lists/bloc/list_feed_bloc_test.dart
index 9122409..149421c 100644
--- a/test/features/lists/bloc/list_feed_bloc_test.dart
+++ b/test/features/lists/bloc/list_feed_bloc_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart';
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/lists/bloc/list_feed_bloc.dart';
 import 'package:lazurite/features/lists/data/list_repository.dart';
diff --git a/test/features/lists/cubit/add_to_list_cubit_test.dart b/test/features/lists/cubit/add_to_list_cubit_test.dart
index eef4058..a1b722a 100644
--- a/test/features/lists/cubit/add_to_list_cubit_test.dart
+++ b/test/features/lists/cubit/add_to_list_cubit_test.dart
@@ -1,8 +1,8 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/get_lists_with_membership.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_lists_with_membership.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/lists/cubit/add_to_list_cubit.dart';
 import 'package:lazurite/features/lists/data/list_repository.dart';
diff --git a/test/features/lists/cubit/my_lists_cubit_test.dart b/test/features/lists/cubit/my_lists_cubit_test.dart
index 38511f1..62965a6 100644
--- a/test/features/lists/cubit/my_lists_cubit_test.dart
+++ b/test/features/lists/cubit/my_lists_cubit_test.dart
@@ -2,8 +2,8 @@ import 'dart:async';
 
 import 'package:bloc_test/bloc_test.dart';
 import 'package:poptart_core/poptart_core.dart' show AtUri, Blob, BlobRef;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/lists/cubit/my_lists_cubit.dart';
 import 'package:lazurite/features/lists/data/list_repository.dart';
@@ -144,7 +144,11 @@ void main() {
 
     test('createList uploads avatar when bytes provided', () async {
       final cubit = MyListsCubit(listRepository: mockListRepository);
-      const avatar = Blob(ref: BlobRef(link: 'bafkreiavatarblob'), mimeType: 'image/jpeg', size: 3);
+      const avatar = Blob(
+        ref: BlobRef(link: 'bafkreiavatarblob'),
+        mimeType: 'image/jpeg',
+        size: 3,
+      );
 
       when(
         () => mockListRepository.uploadListAvatar(
diff --git a/test/features/lists/data/list_repository_test.dart b/test/features/lists/data/list_repository_test.dart
index 25a8f6f..58ca4cc 100644
--- a/test/features/lists/data/list_repository_test.dart
+++ b/test/features/lists/data/list_repository_test.dart
@@ -5,14 +5,14 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
 import 'package:lazurite/features/lists/data/list_repository.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/search_actors_typeahead.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_list_feed.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/get_list.dart';
-import 'package:poptart_lex/app/bsky/graph/get_lists.dart';
-import 'package:poptart_lex/app/bsky/graph/get_lists_with_membership.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/search_actors_typeahead.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_list_feed.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_list.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_lists.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_lists_with_membership.dart';
 import 'package:poptart_lex/com/atproto/repo/create_record.dart';
 import 'package:poptart_lex/com/atproto/repo/delete_record.dart';
 import 'package:poptart_lex/com/atproto/repo/put_record.dart';
diff --git a/test/features/lists/presentation/list_detail_screen_test.dart b/test/features/lists/presentation/list_detail_screen_test.dart
index bf2228b..a599bf5 100644
--- a/test/features/lists/presentation/list_detail_screen_test.dart
+++ b/test/features/lists/presentation/list_detail_screen_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/lists/presentation/list_members_screen_test.dart b/test/features/lists/presentation/list_members_screen_test.dart
index 9c8a8e2..f615546 100644
--- a/test/features/lists/presentation/list_members_screen_test.dart
+++ b/test/features/lists/presentation/list_members_screen_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/lists/presentation/my_lists_screen_test.dart b/test/features/lists/presentation/my_lists_screen_test.dart
index 4a5c651..3be3c1e 100644
--- a/test/features/lists/presentation/my_lists_screen_test.dart
+++ b/test/features/lists/presentation/my_lists_screen_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/messages/bloc/convo_list_bloc_test.dart b/test/features/messages/bloc/convo_list_bloc_test.dart
index 4a9372d..89a0c94 100644
--- a/test/features/messages/bloc/convo_list_bloc_test.dart
+++ b/test/features/messages/bloc/convo_list_bloc_test.dart
@@ -1,5 +1,5 @@
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/messages/bloc/convo_list_bloc.dart';
 import 'package:lazurite/features/messages/data/convo_repository.dart';
diff --git a/test/features/messages/bloc/message_bloc_test.dart b/test/features/messages/bloc/message_bloc_test.dart
index 16f0e8b..4a256fc 100644
--- a/test/features/messages/bloc/message_bloc_test.dart
+++ b/test/features/messages/bloc/message_bloc_test.dart
@@ -1,6 +1,6 @@
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
-import 'package:poptart_lex/chat/bsky/convo/get_messages.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/get_messages.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/messages/bloc/message_bloc.dart';
 import 'package:lazurite/features/messages/data/convo_repository.dart';
diff --git a/test/features/messages/data/convo_repository_test.dart b/test/features/messages/data/convo_repository_test.dart
index 37ee765..c7fe68a 100644
--- a/test/features/messages/data/convo_repository_test.dart
+++ b/test/features/messages/data/convo_repository_test.dart
@@ -3,7 +3,7 @@ import 'dart:convert';
 
 import 'package:poptart_core/poptart_core.dart' as atcore;
 import 'package:lazurite/core/network/poptart_client_adapter.dart';
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:lazurite/features/auth/data/models/auth_models.dart';
diff --git a/test/features/messages/presentation/convo_list_screen_test.dart b/test/features/messages/presentation/convo_list_screen_test.dart
index 759472e..f8f3a8c 100644
--- a/test/features/messages/presentation/convo_list_screen_test.dart
+++ b/test/features/messages/presentation/convo_list_screen_test.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/chat/bsky/actor/defs.dart';
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/test/features/messages/presentation/message_thread_screen_test.dart b/test/features/messages/presentation/message_thread_screen_test.dart
index 9d6a78c..be2fcb6 100644
--- a/test/features/messages/presentation/message_thread_screen_test.dart
+++ b/test/features/messages/presentation/message_thread_screen_test.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
-import 'package:poptart_lex/chat/bsky/convo/get_messages.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/get_messages.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/messages/presentation/widgets/convo_list_item_test.dart b/test/features/messages/presentation/widgets/convo_list_item_test.dart
index ace4dcd..38c9ec4 100644
--- a/test/features/messages/presentation/widgets/convo_list_item_test.dart
+++ b/test/features/messages/presentation/widgets/convo_list_item_test.dart
@@ -1,5 +1,5 @@
-import 'package:poptart_lex/chat/bsky/actor/defs.dart';
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/messages/presentation/widgets/convo_list_item.dart';
diff --git a/test/features/messages/presentation/widgets/message_bubble_test.dart b/test/features/messages/presentation/widgets/message_bubble_test.dart
index a410913..cc67dc8 100644
--- a/test/features/messages/presentation/widgets/message_bubble_test.dart
+++ b/test/features/messages/presentation/widgets/message_bubble_test.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/chat/bsky/convo/defs.dart';
+import 'package:bluesky_poptart/chat/bsky/convo/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/messages/presentation/widgets/message_bubble.dart';
diff --git a/test/features/moderation/data/moderation_service_test.dart b/test/features/moderation/data/moderation_service_test.dart
index 0f74631..880b546 100644
--- a/test/features/moderation/data/moderation_service_test.dart
+++ b/test/features/moderation/data/moderation_service_test.dart
@@ -1,12 +1,12 @@
 import 'dart:convert';
 
 import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/get_preferences.dart';
-import 'package:poptart_lex/app/bsky/actor/put_preferences.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/labeler/defs.dart';
-import 'package:poptart_lex/app/bsky/labeler/get_services.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/get_preferences.dart';
+import 'package:bluesky_poptart/app/bsky/actor/put_preferences.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/defs.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/get_services.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
diff --git a/test/features/moderation/presentation/moderation_screens_test.dart b/test/features/moderation/presentation/moderation_screens_test.dart
index 9fe1338..8b0aa9f 100644
--- a/test/features/moderation/presentation/moderation_screens_test.dart
+++ b/test/features/moderation/presentation/moderation_screens_test.dart
@@ -1,9 +1,9 @@
 import 'package:poptart_lex/com/atproto/label/defs.dart';
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/labeler/defs.dart';
-import 'package:poptart_lex/app/bsky/labeler/get_services.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/defs.dart';
+import 'package:bluesky_poptart/app/bsky/labeler/get_services.dart';
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/moderation/presentation/widgets/moderation_badge_row_test.dart b/test/features/moderation/presentation/widgets/moderation_badge_row_test.dart
index e109681..d468a64 100644
--- a/test/features/moderation/presentation/widgets/moderation_badge_row_test.dart
+++ b/test/features/moderation/presentation/widgets/moderation_badge_row_test.dart
@@ -1,5 +1,5 @@
 import 'package:poptart_lex/com/atproto/label/defs.dart';
-import 'package:poptart_bluesky_moderation/poptart_bluesky_moderation.dart' as bsky_moderation;
+import 'package:lazurite/features/moderation/domain/moderation_models.dart' as bsky_moderation;
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/moderation/presentation/widgets/moderation_badge_row.dart';
diff --git a/test/features/notifications/bloc/notification_bloc_test.dart b/test/features/notifications/bloc/notification_bloc_test.dart
index 18300dd..9528868 100644
--- a/test/features/notifications/bloc/notification_bloc_test.dart
+++ b/test/features/notifications/bloc/notification_bloc_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart';
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/notifications/bloc/notification_bloc.dart';
 import 'package:lazurite/features/notifications/data/notification_repository.dart';
diff --git a/test/features/notifications/data/notification_repository_test.dart b/test/features/notifications/data/notification_repository_test.dart
index b44e595..2e9bbac 100644
--- a/test/features/notifications/data/notification_repository_test.dart
+++ b/test/features/notifications/data/notification_repository_test.dart
@@ -4,8 +4,8 @@ import 'package:lazurite/core/network/poptart_client_adapter.dart';
 import 'package:lazurite/features/auth/data/models/auth_models.dart';
 import 'package:lazurite/features/notifications/data/notification_repository.dart';
 import 'package:mocktail/mocktail.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 
 class MockNotificationRepository extends Mock implements NotificationRepository {}
 
diff --git a/test/features/notifications/domain/notification_domain_service_test.dart b/test/features/notifications/domain/notification_domain_service_test.dart
index be9871f..486c13c 100644
--- a/test/features/notifications/domain/notification_domain_service_test.dart
+++ b/test/features/notifications/domain/notification_domain_service_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/core/database/app_database.dart';
diff --git a/test/features/notifications/domain/notification_local_mappers_test.dart b/test/features/notifications/domain/notification_local_mappers_test.dart
index 9cd3fa3..bc1f73d 100644
--- a/test/features/notifications/domain/notification_local_mappers_test.dart
+++ b/test/features/notifications/domain/notification_local_mappers_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/notifications/domain/notification_local_mappers.dart';
 import 'package:lazurite/features/notifications/domain/notification_local_models.dart';
diff --git a/test/features/notifications/domain/notification_push_payload_processing_test.dart b/test/features/notifications/domain/notification_push_payload_processing_test.dart
index 6a71c2d..77ec435 100644
--- a/test/features/notifications/domain/notification_push_payload_processing_test.dart
+++ b/test/features/notifications/domain/notification_push_payload_processing_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/core/database/app_database.dart';
diff --git a/test/features/notifications/domain/notification_reason_utils_test.dart b/test/features/notifications/domain/notification_reason_utils_test.dart
index 36066cc..baed33a 100644
--- a/test/features/notifications/domain/notification_reason_utils_test.dart
+++ b/test/features/notifications/domain/notification_reason_utils_test.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/notifications/domain/notification_reason_utils.dart';
 
diff --git a/test/features/notifications/presentation/notifications_screen_test.dart b/test/features/notifications/presentation/notifications_screen_test.dart
index bbd004a..17e12ff 100644
--- a/test/features/notifications/presentation/notifications_screen_test.dart
+++ b/test/features/notifications/presentation/notifications_screen_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
diff --git a/test/features/notifications/presentation/widgets/notification_list_item_test.dart b/test/features/notifications/presentation/widgets/notification_list_item_test.dart
index 66b804f..8f901f7 100644
--- a/test/features/notifications/presentation/widgets/notification_list_item_test.dart
+++ b/test/features/notifications/presentation/widgets/notification_list_item_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:go_router/go_router.dart';
diff --git a/test/features/profile/bloc/profile_bloc_test.dart b/test/features/profile/bloc/profile_bloc_test.dart
index 1cb757b..fd49923 100644
--- a/test/features/profile/bloc/profile_bloc_test.dart
+++ b/test/features/profile/bloc/profile_bloc_test.dart
@@ -1,5 +1,5 @@
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/profile/bloc/profile_bloc.dart';
 import 'package:lazurite/features/profile/data/profile_repository.dart';
diff --git a/test/features/profile/cubit/profile_connections_cubit_test.dart b/test/features/profile/cubit/profile_connections_cubit_test.dart
index 3b453bb..274a514 100644
--- a/test/features/profile/cubit/profile_connections_cubit_test.dart
+++ b/test/features/profile/cubit/profile_connections_cubit_test.dart
@@ -1,5 +1,5 @@
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/core/network/constellation_client.dart';
 import 'package:lazurite/features/profile/cubit/profile_connections_cubit.dart';
diff --git a/test/features/profile/cubit/profile_context_cubit_test.dart b/test/features/profile/cubit/profile_context_cubit_test.dart
index 8e8ac3b..aa0eace 100644
--- a/test/features/profile/cubit/profile_context_cubit_test.dart
+++ b/test/features/profile/cubit/profile_context_cubit_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/profile/cubit/profile_context_cubit.dart';
 import 'package:lazurite/features/profile/data/profile_context_repository.dart';
diff --git a/test/features/profile/cubit/suggested_follows_cubit_test.dart b/test/features/profile/cubit/suggested_follows_cubit_test.dart
index 0763336..21b3708 100644
--- a/test/features/profile/cubit/suggested_follows_cubit_test.dart
+++ b/test/features/profile/cubit/suggested_follows_cubit_test.dart
@@ -1,5 +1,5 @@
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/profile/cubit/suggested_follows_cubit.dart';
 import 'package:lazurite/features/profile/data/profile_repository.dart';
diff --git a/test/features/profile/data/follow_audit_repository_test.dart b/test/features/profile/data/follow_audit_repository_test.dart
index 26f0b08..cbdc88c 100644
--- a/test/features/profile/data/follow_audit_repository_test.dart
+++ b/test/features/profile/data/follow_audit_repository_test.dart
@@ -2,8 +2,8 @@ import 'dart:convert';
 
 import 'package:poptart_lex/com/atproto/repo/apply_writes.dart';
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/get_profiles.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/get_profiles.dart';
 import 'package:poptart_lex/com/atproto/repo/list_records.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
diff --git a/test/features/profile/data/profile_context_repository_test.dart b/test/features/profile/data/profile_context_repository_test.dart
index 8af70d7..31d2a4a 100644
--- a/test/features/profile/data/profile_context_repository_test.dart
+++ b/test/features/profile/data/profile_context_repository_test.dart
@@ -1,10 +1,10 @@
 import 'dart:convert';
 
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/get_profiles.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/get_list.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/get_profiles.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_list.dart';
 import 'package:poptart_lex/com/atproto/repo/list_records.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
diff --git a/test/features/profile/data/profile_repository_actor_likes_test.dart b/test/features/profile/data/profile_repository_actor_likes_test.dart
index 3383a9b..26aa1ce 100644
--- a/test/features/profile/data/profile_repository_actor_likes_test.dart
+++ b/test/features/profile/data/profile_repository_actor_likes_test.dart
@@ -1,8 +1,8 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/get_actor_likes.dart';
-import 'package:poptart_lex/app/bsky/feed/get_posts.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_actor_likes.dart';
+import 'package:bluesky_poptart/app/bsky/feed/get_posts.dart';
 import 'package:poptart_lex/com/atproto/repo/list_records.dart';
 import 'package:drift/native.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/profile/data/profile_repository_test.dart b/test/features/profile/data/profile_repository_test.dart
index ce5e1a9..2d8f52a 100644
--- a/test/features/profile/data/profile_repository_test.dart
+++ b/test/features/profile/data/profile_repository_test.dart
@@ -2,11 +2,11 @@ import 'dart:convert';
 import 'dart:typed_data';
 
 import 'package:poptart_core/poptart_core.dart' as atp_core;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/get_profiles.dart';
-import 'package:poptart_lex/app/bsky/graph/get_followers.dart';
-import 'package:poptart_lex/app/bsky/graph/get_follows.dart';
-import 'package:poptart_lex/app/bsky/graph/get_suggested_follows_by_actor.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/get_profiles.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_followers.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_follows.dart';
+import 'package:bluesky_poptart/app/bsky/graph/get_suggested_follows_by_actor.dart';
 import 'package:poptart_lex/com/atproto/repo/get_record.dart';
 import 'package:poptart_lex/com/atproto/repo/put_record.dart';
 import 'package:poptart_lex/com/atproto/repo/upload_blob.dart';
diff --git a/test/features/profile/presentation/profile_connections_screen_test.dart b/test/features/profile/presentation/profile_connections_screen_test.dart
index a1c0e46..20e89ec 100644
--- a/test/features/profile/presentation/profile_connections_screen_test.dart
+++ b/test/features/profile/presentation/profile_connections_screen_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/profile/presentation/profile_context_screen_test.dart b/test/features/profile/presentation/profile_context_screen_test.dart
index a6330dc..1140559 100644
--- a/test/features/profile/presentation/profile_context_screen_test.dart
+++ b/test/features/profile/presentation/profile_context_screen_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart' as bsky_graph;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart' as bsky_graph;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/profile/presentation/profile_edit_screen_test.dart b/test/features/profile/presentation/profile_edit_screen_test.dart
index 5d89557..3056d80 100644
--- a/test/features/profile/presentation/profile_edit_screen_test.dart
+++ b/test/features/profile/presentation/profile_edit_screen_test.dart
@@ -1,5 +1,5 @@
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/profile/presentation/profile_screen_test.dart b/test/features/profile/presentation/profile_screen_test.dart
index 123a6a9..5c4b564 100644
--- a/test/features/profile/presentation/profile_screen_test.dart
+++ b/test/features/profile/presentation/profile_screen_test.dart
@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:poptart_core/poptart_core.dart';
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart' hide ReplyRef;
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart' hide ReplyRef;
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/profile/presentation/widgets/suggested_follows_sheet_test.dart b/test/features/profile/presentation/widgets/suggested_follows_sheet_test.dart
index d7076c9..96cb8c9 100644
--- a/test/features/profile/presentation/widgets/suggested_follows_sheet_test.dart
+++ b/test/features/profile/presentation/widgets/suggested_follows_sheet_test.dart
@@ -1,7 +1,7 @@
 import 'package:bloc_test/bloc_test.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:go_router/go_router.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/profile/cubit/suggested_follows_cubit.dart';
diff --git a/test/features/search/bloc/search_bloc_test.dart b/test/features/search/bloc/search_bloc_test.dart
index 3fe78dd..73a09e2 100644
--- a/test/features/search/bloc/search_bloc_test.dart
+++ b/test/features/search/bloc/search_bloc_test.dart
@@ -1,8 +1,8 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/core/database/app_database.dart';
 import 'package:lazurite/features/search/bloc/search_bloc.dart';
diff --git a/test/features/search/cubit/hashtag_cubit_test.dart b/test/features/search/cubit/hashtag_cubit_test.dart
index a39027a..46a7e36 100644
--- a/test/features/search/cubit/hashtag_cubit_test.dart
+++ b/test/features/search/cubit/hashtag_cubit_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/search/cubit/hashtag_cubit.dart';
 import 'package:lazurite/features/search/data/search_repository.dart';
diff --git a/test/features/search/cubit/topic_cubit_test.dart b/test/features/search/cubit/topic_cubit_test.dart
index cd30eec..2da905f 100644
--- a/test/features/search/cubit/topic_cubit_test.dart
+++ b/test/features/search/cubit/topic_cubit_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/search/cubit/topic_cubit.dart';
 import 'package:lazurite/features/search/data/search_repository.dart';
diff --git a/test/features/search/data/hashtag_utils_test.dart b/test/features/search/data/hashtag_utils_test.dart
index c505c63..ee9e4f1 100644
--- a/test/features/search/data/hashtag_utils_test.dart
+++ b/test/features/search/data/hashtag_utils_test.dart
@@ -1,8 +1,8 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
-import 'package:poptart_lex/app/bsky/richtext/facet.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/richtext/facet.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/search/data/hashtag_utils.dart';
 
diff --git a/test/features/search/data/post_text_extractor_test.dart b/test/features/search/data/post_text_extractor_test.dart
index 7a47047..4828e95 100644
--- a/test/features/search/data/post_text_extractor_test.dart
+++ b/test/features/search/data/post_text_extractor_test.dart
@@ -1,11 +1,11 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/embed/external.dart';
-import 'package:poptart_lex/app/bsky/embed/images.dart';
-import 'package:poptart_lex/app/bsky/embed/record.dart';
-import 'package:poptart_lex/app/bsky/embed/record_with_media.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/post.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/embed/external.dart';
+import 'package:bluesky_poptart/app/bsky/embed/images.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record.dart';
+import 'package:bluesky_poptart/app/bsky/embed/record_with_media.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/post.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/search/data/post_text_extractor.dart';
 
diff --git a/test/features/search/data/search_repository_post_filters_test.dart b/test/features/search/data/search_repository_post_filters_test.dart
index de6fcfd..9e2d653 100644
--- a/test/features/search/data/search_repository_post_filters_test.dart
+++ b/test/features/search/data/search_repository_post_filters_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/search_posts.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/search_posts.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:lazurite/features/search/data/post_search_filters.dart';
diff --git a/test/features/search/data/search_repository_test.dart b/test/features/search/data/search_repository_test.dart
index fd15730..fab49ed 100644
--- a/test/features/search/data/search_repository_test.dart
+++ b/test/features/search/data/search_repository_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/search/data/search_repository.dart';
 import 'package:mocktail/mocktail.dart';
diff --git a/test/features/search/presentation/hashtag_screen_test.dart b/test/features/search/presentation/hashtag_screen_test.dart
index 30dfa06..5ac7104 100644
--- a/test/features/search/presentation/hashtag_screen_test.dart
+++ b/test/features/search/presentation/hashtag_screen_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/search/presentation/profile_post_search_screen_test.dart b/test/features/search/presentation/profile_post_search_screen_test.dart
index 46c4152..d2bc719 100644
--- a/test/features/search/presentation/profile_post_search_screen_test.dart
+++ b/test/features/search/presentation/profile_post_search_screen_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/search/presentation/search_screen_test.dart b/test/features/search/presentation/search_screen_test.dart
index 9b2cfda..ce28295 100644
--- a/test/features/search/presentation/search_screen_test.dart
+++ b/test/features/search/presentation/search_screen_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart';
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/settings/data/video_repository_test.dart b/test/features/settings/data/video_repository_test.dart
index 381f205..dd1f6c8 100644
--- a/test/features/settings/data/video_repository_test.dart
+++ b/test/features/settings/data/video_repository_test.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:poptart_lex/app/bsky/video/get_upload_limits.dart';
+import 'package:bluesky_poptart/app/bsky/video/get_upload_limits.dart';
 import 'package:lazurite/features/settings/data/video_repository.dart';
 
 class FakeVideoUploadLimitsApi implements VideoUploadLimitsApi {
diff --git a/test/features/starter_packs/bloc/starter_pack_bloc_test.dart b/test/features/starter_packs/bloc/starter_pack_bloc_test.dart
index 7fdc8bd..bedccf1 100644
--- a/test/features/starter_packs/bloc/starter_pack_bloc_test.dart
+++ b/test/features/starter_packs/bloc/starter_pack_bloc_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/starter_packs/bloc/starter_pack_bloc.dart';
 import 'package:lazurite/features/starter_packs/data/starter_pack_repository.dart';
diff --git a/test/features/starter_packs/cubit/actor_starter_packs_cubit_test.dart b/test/features/starter_packs/cubit/actor_starter_packs_cubit_test.dart
index 6006f1d..a14844c 100644
--- a/test/features/starter_packs/cubit/actor_starter_packs_cubit_test.dart
+++ b/test/features/starter_packs/cubit/actor_starter_packs_cubit_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
 import 'package:bloc_test/bloc_test.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/features/starter_packs/cubit/actor_starter_packs_cubit.dart';
 import 'package:lazurite/features/starter_packs/data/starter_pack_repository.dart';
diff --git a/test/features/starter_packs/presentation/actor_starter_packs_screen_test.dart b/test/features/starter_packs/presentation/actor_starter_packs_screen_test.dart
index 53bc9d9..fc25d1a 100644
--- a/test/features/starter_packs/presentation/actor_starter_packs_screen_test.dart
+++ b/test/features/starter_packs/presentation/actor_starter_packs_screen_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/starter_packs/presentation/create_edit_starter_pack_screen_test.dart b/test/features/starter_packs/presentation/create_edit_starter_pack_screen_test.dart
index 3ded405..fff7e2f 100644
--- a/test/features/starter_packs/presentation/create_edit_starter_pack_screen_test.dart
+++ b/test/features/starter_packs/presentation/create_edit_starter_pack_screen_test.dart
@@ -1,6 +1,6 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/starter_packs/presentation/starter_pack_detail_screen_test.dart b/test/features/starter_packs/presentation/starter_pack_detail_screen_test.dart
index df7abf2..9247510 100644
--- a/test/features/starter_packs/presentation/starter_pack_detail_screen_test.dart
+++ b/test/features/starter_packs/presentation/starter_pack_detail_screen_test.dart
@@ -1,7 +1,7 @@
 import 'package:poptart_core/poptart_core.dart' show AtUri;
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
-import 'package:poptart_lex/app/bsky/graph/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/graph/defs.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/test/features/typeahead/data/typeahead_repository_test.dart b/test/features/typeahead/data/typeahead_repository_test.dart
index 32014e8..11f9d9a 100644
--- a/test/features/typeahead/data/typeahead_repository_test.dart
+++ b/test/features/typeahead/data/typeahead_repository_test.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/actor/search_actors_typeahead.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/search_actors_typeahead.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:http/http.dart' as http;
 import 'package:lazurite/core/network/poptart_client_adapter.dart' show Bluesky;
diff --git a/test/shared/presentation/helpers/notification_icon_mapper_test.dart b/test/shared/presentation/helpers/notification_icon_mapper_test.dart
index 7cbdc03..2a4eec2 100644
--- a/test/shared/presentation/helpers/notification_icon_mapper_test.dart
+++ b/test/shared/presentation/helpers/notification_icon_mapper_test.dart
@@ -1,4 +1,4 @@
-import 'package:poptart_lex/app/bsky/notification/list_notifications.dart' as bsky;
+import 'package:bluesky_poptart/app/bsky/notification/list_notifications.dart' as bsky;
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:lazurite/shared/presentation/helpers/notification_icon_mapper.dart';
diff --git a/test/shared/utils/format_utils_test.dart b/test/shared/utils/format_utils_test.dart
index c799827..543b891 100644
--- a/test/shared/utils/format_utils_test.dart
+++ b/test/shared/utils/format_utils_test.dart
@@ -1,8 +1,8 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:intl/intl.dart';
 import 'package:poptart_core/poptart_core.dart';
-import 'package:poptart_lex/app/bsky/actor/defs.dart';
-import 'package:poptart_lex/app/bsky/feed/defs.dart';
+import 'package:bluesky_poptart/app/bsky/actor/defs.dart';
+import 'package:bluesky_poptart/app/bsky/feed/defs.dart';
 import 'package:lazurite/shared/utils/format_utils.dart';
 
 void main() {