diff --git a/packages/neon_framework/lib/src/blocs/accounts.dart b/packages/neon_framework/lib/src/blocs/accounts.dart
index c31f7561f61..437d64538e4 100644
--- a/packages/neon_framework/lib/src/blocs/accounts.dart
+++ b/packages/neon_framework/lib/src/blocs/accounts.dart
@@ -9,7 +9,7 @@ import 'package:neon_framework/src/blocs/apps.dart';
 import 'package:neon_framework/src/blocs/capabilities.dart';
 import 'package:neon_framework/src/blocs/unified_search.dart';
 import 'package:neon_framework/src/blocs/user_details.dart';
-import 'package:neon_framework/src/blocs/user_statuses.dart';
+import 'package:neon_framework/src/blocs/user_status.dart';
 import 'package:neon_framework/src/models/account.dart';
 import 'package:neon_framework/src/models/account_cache.dart';
 import 'package:neon_framework/src/models/app_implementation.dart';
@@ -113,13 +113,13 @@ abstract interface class AccountsBloc implements Disposable {
 
   /// The userStatusBloc for the [activeAccount].
   ///
-  /// Convenience method for [getUserStatusesBlocFor] with the currently active account.
-  UserStatusesBloc get activeUserStatusesBloc;
+  /// Convenience method for [getUserStatusBlocFor] with the currently active account.
+  UserStatusBloc get activeUserStatusBloc;
 
   /// The userStatusBloc for the specified [account].
   ///
-  /// Use [activeUserStatusesBloc] to get them for the [activeAccount].
-  UserStatusesBloc getUserStatusesBlocFor(Account account);
+  /// Use [activeUserStatusBloc] to get them for the [activeAccount].
+  UserStatusBloc getUserStatusBlocFor(Account account);
 
   /// The UnifiedSearchBloc for the [activeAccount].
   ///
@@ -184,7 +184,7 @@ class _AccountsBloc extends Bloc implements AccountsBloc {
       appsBlocs.pruneAgainst(accounts);
       capabilitiesBlocs.pruneAgainst(accounts);
       userDetailsBlocs.pruneAgainst(accounts);
-      userStatusesBlocs.pruneAgainst(accounts);
+      userStatusBlocs.pruneAgainst(accounts);
       unifiedSearchBlocs.pruneAgainst(accounts);
       for (final app in allAppImplementations) {
         app.blocsCache.pruneAgainst(accounts);
@@ -199,7 +199,7 @@ class _AccountsBloc extends Bloc implements AccountsBloc {
   final appsBlocs = AccountCache<AppsBloc>();
   final capabilitiesBlocs = AccountCache<CapabilitiesBloc>();
   final userDetailsBlocs = AccountCache<UserDetailsBloc>();
-  final userStatusesBlocs = AccountCache<UserStatusesBloc>();
+  final userStatusBlocs = AccountCache<UserStatusBloc>();
   final unifiedSearchBlocs = AccountCache<UnifiedSearchBloc>();
 
   @override
@@ -209,7 +209,7 @@ class _AccountsBloc extends Bloc implements AccountsBloc {
     appsBlocs.dispose();
     capabilitiesBlocs.dispose();
     userDetailsBlocs.dispose();
-    userStatusesBlocs.dispose();
+    userStatusBlocs.dispose();
     unifiedSearchBlocs.dispose();
     accountsOptions.dispose();
   }
@@ -328,10 +328,10 @@ class _AccountsBloc extends Bloc implements AccountsBloc {
   UserDetailsBloc getUserDetailsBlocFor(Account account) => userDetailsBlocs[account] ??= UserDetailsBloc(account);
 
   @override
-  UserStatusesBloc get activeUserStatusesBloc => getUserStatusesBlocFor(aa);
+  UserStatusBloc get activeUserStatusBloc => getUserStatusBlocFor(aa);
 
   @override
-  UserStatusesBloc getUserStatusesBlocFor(Account account) => userStatusesBlocs[account] ??= UserStatusesBloc(account);
+  UserStatusBloc getUserStatusBlocFor(Account account) => userStatusBlocs[account] ??= UserStatusBloc(account);
 
   @override
   UnifiedSearchBloc get activeUnifiedSearchBloc => getUnifiedSearchBlocFor(aa);
diff --git a/packages/neon_framework/lib/src/blocs/user_statuses.dart b/packages/neon_framework/lib/src/blocs/user_status.dart
similarity index 93%
rename from packages/neon_framework/lib/src/blocs/user_statuses.dart
rename to packages/neon_framework/lib/src/blocs/user_status.dart
index 775a74403be..506d84b244e 100644
--- a/packages/neon_framework/lib/src/blocs/user_statuses.dart
+++ b/packages/neon_framework/lib/src/blocs/user_status.dart
@@ -14,9 +14,9 @@ import 'package:rxdart/rxdart.dart';
 import 'package:window_manager/window_manager.dart';
 
 /// Bloc for managing user statuses.
-sealed class UserStatusesBloc implements Disposable {
+sealed class UserStatusBloc implements Disposable {
   @internal
-  factory UserStatusesBloc(Account account) => _UserStatusesBloc(account);
+  factory UserStatusBloc(Account account) => _UserStatusBloc(account);
 
   /// Load the user status of the user with the [username] on the same server.
   ///
@@ -27,8 +27,8 @@ sealed class UserStatusesBloc implements Disposable {
   BehaviorSubject<Map<String, Result<user_status.$PublicInterface>>> get statuses;
 }
 
-class _UserStatusesBloc extends InteractiveBloc implements UserStatusesBloc {
-  _UserStatusesBloc(
+class _UserStatusBloc extends InteractiveBloc implements UserStatusBloc {
+  _UserStatusBloc(
     this.account,
   ) {
     unawaited(refresh());
diff --git a/packages/neon_framework/lib/src/widgets/user_avatar.dart b/packages/neon_framework/lib/src/widgets/user_avatar.dart
index a01a85d249f..34fefcc570a 100644
--- a/packages/neon_framework/lib/src/widgets/user_avatar.dart
+++ b/packages/neon_framework/lib/src/widgets/user_avatar.dart
@@ -46,7 +46,7 @@ class NeonUserAvatar extends StatefulWidget {
 }
 
 class _UserAvatarState extends State<NeonUserAvatar> {
-  late final _userStatusBloc = NeonProvider.of<AccountsBloc>(context).getUserStatusesBlocFor(widget.account);
+  late final _userStatusBloc = NeonProvider.of<AccountsBloc>(context).getUserStatusBlocFor(widget.account);
   late double size;
 
   @override