diff --git a/src/plugins/callgraph/cg.ml b/src/plugins/callgraph/cg.ml
index 5d8feaafee1103b0ae9e6ab5c54fdc62a8232cca..091419156608e56ece6f04cbb0f4c78293d90eb8 100644
--- a/src/plugins/callgraph/cg.ml
+++ b/src/plugins/callgraph/cg.ml
@@ -228,7 +228,7 @@ let compute () =
   (* optimize with [Value] when either it is already computed or someone
      requires it anyway *)
   if Dynamic.Parameter.Bool.get "-eva" () then begin
-    !Db.Value.compute ();
+    Eva.Analysis.compute ();
     semantic_compute g
   end else
     (if Eva.Analysis.is_computed () then semantic_compute else syntactic_compute) g;
diff --git a/src/plugins/from/callwise.ml b/src/plugins/from/callwise.ml
index bb21f3ad2de3516393ff65b41afc3ecf117009e0..0ca2714df0c75090c5172b5ef8958c59d7ed9501 100644
--- a/src/plugins/from/callwise.ml
+++ b/src/plugins/from/callwise.ml
@@ -201,7 +201,7 @@ let force_compute_all_calldeps ()=
     Project.clear
       ~selection:(State_selection.with_dependencies Eva.Analysis.self)
       ();
-  !Db.Value.compute ()
+  Eva.Analysis.compute ()
 
 (* Registration for call-wise from *)
 let () =
diff --git a/src/plugins/from/from_compute.ml b/src/plugins/from/from_compute.ml
index fe9417bc98ee3b8fd09979bdbb19b51a40f219b9..63a8368418645faa345e05a89987d89d97787290 100644
--- a/src/plugins/from/from_compute.ml
+++ b/src/plugins/from/from_compute.ml
@@ -701,7 +701,7 @@ struct
     result
 
   let compute kf =
-    !Db.Value.compute ();
+    Eva.Analysis.compute ();
     ignore (compute_and_return kf)
 
 end
diff --git a/src/plugins/from/functionwise.ml b/src/plugins/from/functionwise.ml
index 55febbe07ef5d2ce71c973dcf3b7564c5c814903..85d2c9132dc508edccf2970a8c61cc2970dda224 100644
--- a/src/plugins/from/functionwise.ml
+++ b/src/plugins/from/functionwise.ml
@@ -92,7 +92,7 @@ let () =
 
 
 let force_compute_all () =
-  !Db.Value.compute ();
+  Eva.Analysis.compute ();
   Callgraph.Uses.iter_in_rev_order
     (fun kf ->
        if Kernel_function.is_definition kf && !Db.Value.is_called kf
diff --git a/src/plugins/inout/operational_inputs.ml b/src/plugins/inout/operational_inputs.ml
index 72479112c1527a6e042ed6e792ad0095ae5b3513..ebeeb9ed96de848f06c64fea8fc103c03c0a5178 100644
--- a/src/plugins/inout/operational_inputs.ml
+++ b/src/plugins/inout/operational_inputs.ml
@@ -801,7 +801,7 @@ let get_internal =
     (fun kf ->
        Eva.Analysis.compute ();
        try Internals.find kf (* The results may have been computed by the call
-                                to Value.compute *)
+                                to Eva.Analysis.compute *)
        with
        | Not_found ->
          if!Db.Value.use_spec_instead_of_definition kf then
diff --git a/src/plugins/users/users_register.ml b/src/plugins/users/users_register.ml
index ddc6e05e41d217cc545017e33a0345779a6ea3e8..f54caf8bbdad18a92cf2f1cc202edfe0c9be2142 100644
--- a/src/plugins/users/users_register.ml
+++ b/src/plugins/users/users_register.ml
@@ -53,7 +53,7 @@ let call_for_users (_state, call_stack) =
   | (current_function, _call_site) :: tail ->
     if tail = [] then begin
       (* End of Value analysis, we record that Users has run. We should not
-         do this after the explicit call to Db.Value.compute later in this
+         do this after the explicit call to Eva.Analysis.compute later in this
          file, as Value can run on its own and execute Users while doing so.*)
       Users.mark_as_computed ()
     end;