diff --git a/packages/test_track/lib/src/domain/get_visitor_config.dart b/packages/test_track/lib/src/domain/get_visitor_config.dart
index 8231d92..4d33a4d 100644
--- a/packages/test_track/lib/src/domain/get_visitor_config.dart
+++ b/packages/test_track/lib/src/domain/get_visitor_config.dart
@@ -41,7 +41,7 @@ class GetVisitorConfig {
         '${appVersionBuild.buildTimestamp}/visitors/$visitorId/config',
       ),
       onResponse: (r) => switch (r) {
-        Ok(:final response) => AppVisitorConfig.fromJson(response),
+        OkResponse(:final response) => AppVisitorConfig.fromJson(response),
         _ => throw Exception(r.toString()),
       },
     );
diff --git a/packages/test_track/lib/src/domain/override_assignments.dart b/packages/test_track/lib/src/domain/override_assignments.dart
index 8175cd1..2b40c8a 100644
--- a/packages/test_track/lib/src/domain/override_assignments.dart
+++ b/packages/test_track/lib/src/domain/override_assignments.dart
@@ -31,7 +31,7 @@ class OverrideAssignments {
         }),
       ),
       onResponse: (r) => switch (r) {
-        NoContent() => null,
+        OkNoContent() => null,
         _ => throw Exception('Failed to override assignments: $r'),
       },
     );
diff --git a/packages/test_track/lib/src/domain/report_assignment_event.dart b/packages/test_track/lib/src/domain/report_assignment_event.dart
index b66c6ef..1ec96cb 100644
--- a/packages/test_track/lib/src/domain/report_assignment_event.dart
+++ b/packages/test_track/lib/src/domain/report_assignment_event.dart
@@ -36,7 +36,7 @@ class ReportAssignmentEvent {
         ),
       ),
       onResponse: (r) => switch (r) {
-        NoContent() => null,
+        OkNoContent() => null,
         _ => _logger.error('Unable to report assignment event: $assignmentEvent with error: $r'),
       },
     );
diff --git a/packages/test_track/lib/src/domain/test_track_login.dart b/packages/test_track/lib/src/domain/test_track_login.dart
index a2915ef..e8978ac 100644
--- a/packages/test_track/lib/src/domain/test_track_login.dart
+++ b/packages/test_track/lib/src/domain/test_track_login.dart
@@ -55,7 +55,7 @@ class Login {
         ),
       ),
       onResponse: (r) => switch (r) {
-        Ok(:final response) => AppVisitorConfig.fromJson(response),
+        OkResponse(:final response) => AppVisitorConfig.fromJson(response),
         _ => throw TestTrackLoginFailureException(message: r.toString()),
       },
     );
diff --git a/packages/test_track/lib/src/networking/interceptors/retry_interceptor.dart b/packages/test_track/lib/src/networking/interceptors/retry_interceptor.dart
index 5273be5..4289922 100644
--- a/packages/test_track/lib/src/networking/interceptors/retry_interceptor.dart
+++ b/packages/test_track/lib/src/networking/interceptors/retry_interceptor.dart
@@ -71,14 +71,14 @@ class RetryInterceptor extends Interceptor {
             // most cases, and would require a `sturdy_http` change if we want
             // to gain access to the raw response.
             switch (r) {
-              case Ok(:final response):
+              case OkResponse(:final response):
                 handler.resolve(
                   Response(
                     data: response,
                     requestOptions: err.requestOptions,
                   ),
                 );
-              case NoContent():
+              case OkNoContent():
                 handler.resolve(
                   Response(
                     statusCode: 204,