diff --git a/crates/core/src/driver/mod.rs b/crates/core/src/driver/mod.rs
index 088741c..f996847 100644
--- a/crates/core/src/driver/mod.rs
+++ b/crates/core/src/driver/mod.rs
@@ -37,7 +37,7 @@ use revive_dt_report::reporter::{CompilationTask, Report, Span};
 
 use crate::Platform;
 
-pub struct State<'a, T: Platform> {
+pub struct CaseState<'a, T: Platform> {
     /// The configuration that the framework was started with.
     ///
     /// This is currently used to get certain information from it such as the solc mode and other
@@ -71,7 +71,7 @@ pub struct State<'a, T: Platform> {
     phantom: PhantomData<T>,
 }
 
-impl<'a, T> State<'a, T>
+impl<'a, T> CaseState<'a, T>
 where
     T: Platform,
 {
@@ -731,7 +731,7 @@ where
     }
 }
 
-pub struct Driver<'a, Leader: Platform, Follower: Platform> {
+pub struct CaseDriver<'a, Leader: Platform, Follower: Platform> {
     metadata: &'a Metadata,
     case: &'a Case,
     case_idx: CaseIdx,
@@ -740,7 +740,7 @@ pub struct Driver<'a, Leader: Platform, Follower: Platform> {
     follower_node: &'a Follower::Blockchain,
 }
 
-impl<'a, L, F> Driver<'a, L, F>
+impl<'a, L, F> CaseDriver<'a, L, F>
 where
     L: Platform,
     F: Platform,
@@ -752,7 +752,7 @@ where
         config: &'a Arguments,
         leader_node: &'a L::Blockchain,
         follower_node: &'a F::Blockchain,
-    ) -> Driver<'a, L, F> {
+    ) -> CaseDriver<'a, L, F> {
         Self {
             metadata,
             case,
@@ -838,8 +838,8 @@ where
             let tracing_span = tracing::info_span!("With solc mode", solc_mode = ?mode);
             let _guard = tracing_span.enter();
 
-            let mut leader_state = State::<L>::new(self.config, span);
-            let mut follower_state = State::<F>::new(self.config, span);
+            let mut leader_state = CaseState::<L>::new(self.config, span);
+            let mut follower_state = CaseState::<F>::new(self.config, span);
 
             // Note: we are currently forced to do two compilation passes due to linking. In the
             // first compilation pass we compile the libraries and publish them to the chain. In the
diff --git a/crates/core/src/main.rs b/crates/core/src/main.rs
index 84a0c90..a44a6ad 100644
--- a/crates/core/src/main.rs
+++ b/crates/core/src/main.rs
@@ -6,7 +6,7 @@ use rayon::{ThreadPoolBuilder, prelude::*};
 use revive_dt_config::*;
 use revive_dt_core::{
     Geth, Kitchensink, Platform,
-    driver::{Driver, State},
+    driver::{CaseDriver, CaseState},
 };
 use revive_dt_format::{corpus::Corpus, metadata::MetadataFile};
 use revive_dt_node::pool::NodePool;
@@ -119,7 +119,7 @@ where
             );
             let _guard = tracing_span.enter();
 
-            let mut driver = Driver::<L, F>::new(
+            let mut driver = CaseDriver::<L, F>::new(
                 metadata,
                 case,
                 case_idx,
@@ -176,11 +176,11 @@ fn compile_corpus(
         for mode in &metadata.solc_modes() {
             match platform {
                 TestingPlatform::Geth => {
-                    let mut state = State::<Geth>::new(config, span);
+                    let mut state = CaseState::<Geth>::new(config, span);
                     let _ = state.build_contracts(mode, metadata);
                 }
                 TestingPlatform::Kitchensink => {
-                    let mut state = State::<Kitchensink>::new(config, span);
+                    let mut state = CaseState::<Kitchensink>::new(config, span);
                     let _ = state.build_contracts(mode, metadata);
                 }
             };