diff --git a/src/bin/common/solving_loop.ml b/src/bin/common/solving_loop.ml
index 709fa43da7..39f45c8424 100644
--- a/src/bin/common/solving_loop.ml
+++ b/src/bin/common/solving_loop.ml
@@ -100,7 +100,7 @@ let enable_maxsmt b =
 let cmd_on_modes st modes cmd =
   if O.get_input_format () = Some Options.Smtlib2 then begin
     let curr_mode = DO.Mode.get st in
-    if not (List.exists (Util.equal_mode curr_mode)) modes then
+    if not @@ (List.exists (Util.equal_mode curr_mode)) modes then
       Errors.forbidden_command curr_mode cmd
   end
 
@@ -900,9 +900,9 @@ let main () =
         st
         |> State.set partial_model_key None
         |> State.set solver_ctx_key empty_solver_ctx
-        |> DO.Mode.reset
-        |> DO.Optimize.reset
-        |> DO.ProduceAssignment.reset
+        |> DO.Mode.clear
+        |> DO.Optimize.clear
+        |> DO.ProduceAssignment.clear
         |> DO.init
         |> State.set named_terms Util.MS.empty
 
diff --git a/src/lib/frontend/d_state_option.ml b/src/lib/frontend/d_state_option.ml
index 1026fb93e9..20014abdf7 100644
--- a/src/lib/frontend/d_state_option.ml
+++ b/src/lib/frontend/d_state_option.ml
@@ -47,8 +47,8 @@ module type S = sig
   (** Sets the option on the dolmen state. *)
   val set : t -> D_loop.Typer.state -> D_loop.Typer.state
 
-  (** Resets the option to its default value in Options. *)
-  val reset : D_loop.Typer.state -> D_loop.Typer.state
+  (** Clears the option from the state. *)
+  val clear : D_loop.Typer.state -> D_loop.Typer.state
 end
 
 let create_opt
@@ -68,7 +68,7 @@ let create_opt
 
     let unsafe_get st = State.get key st
 
-    let reset st = State.update_opt key (fun _ -> None) st
+    let clear st = State.update_opt key (fun _ -> None) st
 
     let get st =
       try unsafe_get st with
@@ -139,6 +139,6 @@ let options_requiring_initialization = [
 
 let init st =
   List.fold_left
-    (fun st (module S : S) -> S.set (S.get (S.reset st)) st)
+    (fun st (module S : S) -> S.set (S.get (S.clear st)) st)
     st
     options_requiring_initialization
diff --git a/src/lib/frontend/d_state_option.mli b/src/lib/frontend/d_state_option.mli
index a4e2c2eed5..0d373c3c09 100644
--- a/src/lib/frontend/d_state_option.mli
+++ b/src/lib/frontend/d_state_option.mli
@@ -48,7 +48,7 @@ module type S = sig
   val set : t -> D_loop.Typer.state -> D_loop.Typer.state
 
   (** Resets the option to its default value in Options. *)
-  val reset : D_loop.Typer.state -> D_loop.Typer.state
+  val clear : D_loop.Typer.state -> D_loop.Typer.state
 end
 
 (** The current mode of the solver. *)