diff --git a/lib/game/components/backbox/bloc/backbox_bloc.dart b/lib/game/components/backbox/bloc/backbox_bloc.dart
index f51af960..9df40a32 100644
--- a/lib/game/components/backbox/bloc/backbox_bloc.dart
+++ b/lib/game/components/backbox/bloc/backbox_bloc.dart
@@ -48,8 +48,8 @@ class BackboxBloc extends Bloc<BackboxEvent, BackboxState> {
         ),
       );
       emit(InitialsSuccessState());
-    } catch (e, s) {
-      addError(e, s);
+    } catch (error, stackTrace) {
+      addError(error, stackTrace);
       emit(InitialsFailureState());
     }
   }
diff --git a/lib/game/components/backbox/bloc/backbox_event.dart b/lib/game/components/backbox/bloc/backbox_event.dart
index 6d94d55e..35da28fd 100644
--- a/lib/game/components/backbox/bloc/backbox_event.dart
+++ b/lib/game/components/backbox/bloc/backbox_event.dart
@@ -12,7 +12,7 @@ abstract class BackboxEvent extends Equatable {
 /// Event that triggers the user initials display.
 /// {@endtemplate}
 class PlayerInitialsRequested extends BackboxEvent {
-  /// {@template player_initials_requested}
+  /// {@macro player_initials_requested}
   const PlayerInitialsRequested({
     required this.score,
     required this.character,
@@ -28,11 +28,11 @@ class PlayerInitialsRequested extends BackboxEvent {
   List<Object?> get props => [score, character];
 }
 
-/// {@template player_initials_submited}
+/// {@template player_initials_submitted}
 /// Event that submits the user score and initials.
 /// {@endtemplate}
-class PlayerInitialsSubmited extends BackboxEvent {
-  /// {@template player_initials_requested}
+class PlayerInitialsSubmitted extends BackboxEvent {
+  /// {@macro player_initials_submitted}
   const PlayerInitialsSubmited({
     required this.score,
     required this.initials,
diff --git a/lib/game/components/backbox/bloc/backbox_state.dart b/lib/game/components/backbox/bloc/backbox_state.dart
index 47adc53f..558e29ff 100644
--- a/lib/game/components/backbox/bloc/backbox_state.dart
+++ b/lib/game/components/backbox/bloc/backbox_state.dart
@@ -26,7 +26,7 @@ class LeaderboardSuccessState extends BackboxState {
   List<Object?> get props => [];
 }
 
-/// State when the leaderboard was successfully loaded.
+/// State when the leaderboard failed to load.
 class LeaderboardFailureState extends BackboxState {
   @override
   List<Object?> get props => [];
diff --git a/lib/game/components/backbox/displays/initials_submission_failure_display.dart b/lib/game/components/backbox/displays/initials_submission_failure_display.dart
index d92afdbf..178354c2 100644
--- a/lib/game/components/backbox/displays/initials_submission_failure_display.dart
+++ b/lib/game/components/backbox/displays/initials_submission_failure_display.dart
@@ -13,7 +13,7 @@ final _bodyTextPaint = TextPaint(
 );
 
 /// {@template initials_submission_failure_display}
-/// Display when the initials failed to submitted.
+/// [Backbox] display for when a failure occurs during initials submission.
 /// {@endtemplate}
 class InitialsSubmissionFailureDisplay extends TextComponent
     with HasGameRef<PinballGame> {
diff --git a/lib/game/components/backbox/displays/initials_submission_success_display.dart b/lib/game/components/backbox/displays/initials_submission_success_display.dart
index 14e27692..46c35b0e 100644
--- a/lib/game/components/backbox/displays/initials_submission_success_display.dart
+++ b/lib/game/components/backbox/displays/initials_submission_success_display.dart
@@ -13,7 +13,7 @@ final _bodyTextPaint = TextPaint(
 );
 
 /// {@template initials_submission_success_display}
-/// Display when the initials were successfully submitted.
+/// [Backbox] display for initials successfully submitted.
 /// {@endtemplate}
 class InitialsSubmissionSuccessDisplay extends TextComponent
     with HasGameRef<PinballGame> {
diff --git a/test/game/components/backbox/bloc/backbox_bloc_test.dart b/test/game/components/backbox/bloc/backbox_bloc_test.dart
index 6cf92efc..51a88c1a 100644
--- a/test/game/components/backbox/bloc/backbox_bloc_test.dart
+++ b/test/game/components/backbox/bloc/backbox_bloc_test.dart
@@ -31,9 +31,9 @@ void main() {
       ],
     );
 
-    group('PlayerInitialsSubmited', () {
+    group('PlayerInitialsSubmitted', () {
       blocTest<BackboxBloc, BackboxState>(
-        'adds [LoadingState, InitialsSuccessState] when submission works',
+        'adds [LoadingState, InitialsSuccessState] when submission succeeds',
         setUp: () {
           leaderboardRepository = _MockLeaderboardRepository();
           when(
@@ -61,7 +61,7 @@ void main() {
       );
 
       blocTest<BackboxBloc, BackboxState>(
-        'adds [LoadingState, InitialsSuccessState] when submission works',
+        'adds [LoadingState, InitialsFailureState] when submission fails',
         setUp: () {
           leaderboardRepository = _MockLeaderboardRepository();
           when(
diff --git a/test/game/components/backbox/bloc/backbox_event_test.dart b/test/game/components/backbox/bloc/backbox_event_test.dart
index f0e334f4..c6c2cced 100644
--- a/test/game/components/backbox/bloc/backbox_event_test.dart
+++ b/test/game/components/backbox/bloc/backbox_event_test.dart
@@ -42,7 +42,7 @@ void main() {
       });
     });
 
-    group('PlayerInitialsSubmited', () {
+    group('PlayerInitialsSubmitted', () {
       test('can be instantiated', () {
         expect(
           PlayerInitialsSubmited(
diff --git a/test/game/components/backbox/bloc/backbox_state_test.dart b/test/game/components/backbox/bloc/backbox_state_test.dart
index ff18a5b5..3cc825b9 100644
--- a/test/game/components/backbox/bloc/backbox_state_test.dart
+++ b/test/game/components/backbox/bloc/backbox_state_test.dart
@@ -47,7 +47,7 @@ void main() {
     });
 
     group('InitialsFormState', () {
-      test('can be InitialsFormState', () {
+      test('can be instantiated', () {
         expect(
           InitialsFormState(
             score: 0,