diff --git a/share/analysis-scripts/template.mk b/share/analysis-scripts/template.mk
index 8df6a17fa54710ab821c8b8e60457c114092be60..ea7b71e1b33805e330d2a8627e3c65c6bf876c1f 100644
--- a/share/analysis-scripts/template.mk
+++ b/share/analysis-scripts/template.mk
@@ -54,6 +54,11 @@ FCFLAGS     += \
 ## Eva-specific flags
 EVAFLAGS    += \
   -eva-warn-key builtins:missing-spec=abort \
+  -eva-warn-key libc:unsupported-spec=abort \
+  -eva-warn-key recursion=abort \
+
+# Note: if the code has recursive calls, manually review them, add assigns as
+# needed, and remove the line '-eva-warn-key recursion=abort' above
 
 ## WP-specific flags
 WPFLAGS    += \
diff --git a/src/plugins/aorai/tests/ya/oracle/serial.res.oracle b/src/plugins/aorai/tests/ya/oracle/serial.res.oracle
index a65af24e91b5ef5559fd860b117a766a2491a90b..11b74cc25ed98ea59aece2113bffc56c92490426 100644
--- a/src/plugins/aorai/tests/ya/oracle/serial.res.oracle
+++ b/src/plugins/aorai/tests/ya/oracle/serial.res.oracle
@@ -14,19 +14,19 @@
   aorai_StatesHistory_1 ∈ {19}
   aorai_StatesHistory_2 ∈ {19}
 [eva] using specification for function Frama_C_interval
-[eva] serial.c:58: starting to merge loop iterations
-[eva] serial.c:63: Trace partitioning superposing up to 100 states
-[eva] serial.c:63: Trace partitioning superposing up to 200 states
+[eva:partition] serial.c:58: starting to merge loop iterations
+[eva:partition] serial.c:63: Trace partitioning superposing up to 100 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 200 states
 [eva:alarm] serial.c:33: Warning: 
   assertion 'Aorai,aorai_smoke_test' got status invalid (stopping propagation).
 [aorai] serial.c:92: Wait1 <- Wait1 <- Complete
 [aorai] serial.c:92: n in {5},x in [0..16383],y in [0..16383]
-[eva] serial.c:63: Trace partitioning superposing up to 400 states
-[eva] serial.c:63: Trace partitioning superposing up to 600 states
-[eva] serial.c:63: Trace partitioning superposing up to 800 states
-[eva] serial.c:63: Trace partitioning superposing up to 900 states
-[eva] serial.c:63: Trace partitioning superposing up to 1000 states
-[eva] serial.c:63: Trace partitioning superposing up to 1100 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 400 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 600 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 800 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 900 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 1000 states
+[eva:partition] serial.c:63: Trace partitioning superposing up to 1100 states
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function input_data_post_func:
   aorai_x1 ∈ [0..127]
diff --git a/src/plugins/dive/tests/dive/oracle/various.res.oracle b/src/plugins/dive/tests/dive/oracle/various.res.oracle
index 6bad52b3bea256a76522b5f86c10e1a4b9842d43..ddca782f39ad345edf501581d664761ce028af38 100644
--- a/src/plugins/dive/tests/dive/oracle/various.res.oracle
+++ b/src/plugins/dive/tests/dive/oracle/various.res.oracle
@@ -1,6 +1,6 @@
 [kernel] Parsing various.i (no preprocessing)
 [eva] Analyzing a complete application starting at main
-[eva] various.i:10: starting to merge loop iterations
+[eva:partition] various.i:10: starting to merge loop iterations
 [eva:alarm] various.i:13: Warning: 
   non-finite float value.
   assert \is_finite((float)\mul_double((double)y, (double)2.0));
diff --git a/src/plugins/eva/domains/cvalue/builtins_malloc.ml b/src/plugins/eva/domains/cvalue/builtins_malloc.ml
index 1ee6b82715ca54afc45f988ca667aba9050ce75c..9c38fcc3a97f3d96d0fbba50279ee981229a3249 100644
--- a/src/plugins/eva/domains/cvalue/builtins_malloc.ml
+++ b/src/plugins/eva/domains/cvalue/builtins_malloc.ml
@@ -29,6 +29,14 @@ open Lattice_bounds
 let dkey = Self.register_category "malloc"
     ~help:"messages from the builtins interpreting dynamic allocations"
 
+let dkey_new = Self.register_category "malloc:new"
+    ~help:"messages emitted at the creation of new bases"
+let () = Self.add_debug_keys dkey_new
+
+let dkey_auto_free = Self.register_category "malloc:automatic-free"
+    ~help:"messages emitted when bases are automatically freed (alloca or VLA)"
+let () = Self.add_debug_keys dkey_auto_free
+
 let wkey_weak_alloc = Self.register_warn_category "malloc:weak"
 let () = Self.set_warn_status wkey_weak_alloc Log.Winactive
 
@@ -322,7 +330,7 @@ let alloc_fresh weak deallocation prefix sizev _state =
   let tsize = guess_intended_malloc_type stack sizev (weak = Strong) in
   let type_base = type_from_nb_elems tsize in
   let var = create_new_var stack prefix type_base weak in
-  Self.result ~current:true ~once:true
+  Self.result ~dkey:dkey_new ~current:true ~once:true
     "@[allocating %svariable %a@]%t"
     (if weak = Weak then "weak " else "") Printer.pp_varinfo var
     Eva_utils.pp_callstack;
@@ -688,7 +696,7 @@ let free_automatic_bases stack state =
   in
   if Base.Hptset.is_empty bases_to_free then state
   else begin
-    Self.result ~current:true ~once:true
+    Self.result ~dkey:dkey_auto_free ~current:true ~once:true
       "freeing automatic bases: %a" Base.Hptset.pretty bases_to_free;
     let state', _changed = free_aux state ~strong:true bases_to_free in
     (* TODO: propagate 'freed' bases for From? *)
diff --git a/src/plugins/eva/engine/compute_functions.ml b/src/plugins/eva/engine/compute_functions.ml
index fd44697b05b549db2a2b78bb62a481e54fc85819..84a84a278f1bf8f92bd33cd65d43249b3dad5bbb 100644
--- a/src/plugins/eva/engine/compute_functions.ml
+++ b/src/plugins/eva/engine/compute_functions.ml
@@ -235,9 +235,11 @@ module Make (Abstract: Abstractions.S_with_evaluation) = struct
   let compute_using_spec spec kinstr call state =
     if Parameters.InterpreterMode.get ()
     then Self.abort "Library function call. Stopping.";
-    Self.feedback ~once:true
-      "@[using specification for function %a@]" Kernel_function.pretty call.kf;
     let vi = Kernel_function.get_vi call.kf in
+    (* Use vorig_name to avoid message duplication due to variadic renaming. *)
+    Self.feedback ~once:true
+      "@[using specification for function %a@]"
+      Printer.pp_varname vi.vorig_name;
     if Cil.is_in_libc vi.vattr then
       Library_functions.warn_unsupported_spec vi.vorig_name;
     let states =
diff --git a/src/plugins/eva/engine/recursion.ml b/src/plugins/eva/engine/recursion.ml
index d485cceb90038141820e3ab8d0555a0668d49eb7..ba99da15a32494b72c38f4a628b9bd820ba029d5 100644
--- a/src/plugins/eva/engine/recursion.ml
+++ b/src/plugins/eva/engine/recursion.ml
@@ -148,8 +148,8 @@ let make_stack (kf, depth) =
 let get_stack kf depth = VarStack.memo make_stack (kf, depth)
 
 let make_recursion call depth =
-  let dkey = Self.dkey_recursion in
-  Self.feedback ~dkey ~once:true ~current:true
+  let wkey = Self.wkey_recursion in
+  Self.warning ~wkey ~once:true ~current:true
     "@[detected recursive call@ of function %a.@]"
     Kernel_function.pretty call.kf;
   let substitution = get_stack call.kf depth in
diff --git a/src/plugins/eva/partitioning/trace_partitioning.ml b/src/plugins/eva/partitioning/trace_partitioning.ml
index c9930c43e30d8675612d01ab5481c948ccf98c9e..74f9c2175a9fcffdc387e53df4ae3b2f83e38154 100644
--- a/src/plugins/eva/partitioning/trace_partitioning.ml
+++ b/src/plugins/eva/partitioning/trace_partitioning.ml
@@ -25,6 +25,8 @@ open Partition
 
 let stat_max_widenings = Statistics.register_statement_stat "max-widenings"
 
+let dkey = Self.dkey_partition
+
 module Make
     (Abstract: Abstractions.S_with_evaluation)
     (Kf : sig val kf: kernel_function end) =
@@ -241,7 +243,7 @@ struct
       if x >= !max_displayed + slevel_display_step
       then
         let rounded = x / slevel_display_step * slevel_display_step in
-        Self.feedback ~once:true ~current:true
+        Self.feedback ~dkey ~once:true ~current:true
           "Trace partitioning superposing up to %d states"
           rounded;
         max_displayed := rounded
@@ -301,7 +303,7 @@ struct
             else begin
               (* Propagate the join of the two states *)
               if is_loop_head then
-                Self.feedback ~level:1 ~once:true ~current:true
+                Self.feedback ~dkey ~level:1 ~once:true ~current:true
                   "starting to merge loop iterations";
               Some (Domain.join previous_state current_state)
             end
diff --git a/src/plugins/eva/self.ml b/src/plugins/eva/self.ml
index 6f4f14883d2ac101cd9a63fe19d1413f43656c24..19cb808d800770b09c5fcb42c790f314429c7518 100644
--- a/src/plugins/eva/self.ml
+++ b/src/plugins/eva/self.ml
@@ -107,15 +107,15 @@ let dkey_widening =
   register_category "widening"
     ~help:"print a message at each point where the analysis applies a widening"
 
-let dkey_recursion =
-  register_category "recursion"
-    ~help:"print a message for each recursive call"
+let dkey_partition =
+  register_category "partition"
+    ~help:"messages about states partitioning"
 
 let () =
   let activate dkey = add_debug_keys dkey in
   List.iter activate
     [dkey_initial_state; dkey_final_states; dkey_summary; dkey_cvalue_domain;
-     dkey_recursion; ]
+     dkey_partition]
 
 (* Warning categories. *)
 let wkey_alarm = register_warn_category "alarm"
@@ -145,3 +145,5 @@ let wkey_unknown_size = register_warn_category "unknown-size"
 let wkey_ensures_false = register_warn_category "ensures-false"
 let wkey_watchpoint = register_warn_category "watchpoint"
 let () = set_warn_status wkey_watchpoint Log.Wfeedback
+let wkey_recursion = register_warn_category "recursion"
+let () = set_warn_status wkey_recursion Log.Wfeedback
diff --git a/src/plugins/eva/self.mli b/src/plugins/eva/self.mli
index 1c3f9472c47cf5b161fd22c454abf0178e36e878..85525c880411a7f4d927042c63937161cd36907c 100644
--- a/src/plugins/eva/self.mli
+++ b/src/plugins/eva/self.mli
@@ -51,7 +51,7 @@ val dkey_pointer_comparison: category
 val dkey_cvalue_domain: category
 val dkey_iterator : category
 val dkey_widening : category
-val dkey_recursion : category
+val dkey_partition : category
 
 (** {2 Warning categories.} *)
 
@@ -73,3 +73,4 @@ val wkey_experimental : warn_category
 val wkey_unknown_size : warn_category
 val wkey_ensures_false : warn_category
 val wkey_watchpoint : warn_category
+val wkey_recursion : warn_category
diff --git a/src/plugins/eva/utils/library_functions.ml b/src/plugins/eva/utils/library_functions.ml
index 60010cc0b707b7d699061f7dfd524677f9ed8432..7346568c1d647fad0bdbea66a2d70aaeaa5b0abe 100644
--- a/src/plugins/eva/utils/library_functions.ml
+++ b/src/plugins/eva/utils/library_functions.ml
@@ -109,9 +109,9 @@ let warn_unsupported_spec name =
     let header = Hashtbl.find unsupported_specs_tbl name in
     Self.warning ~once:true ~current:true
       ~wkey:Self.wkey_libc_unsupported_spec
-      "@[The specification of function '%s' is currently not supported by Eva.@ \
+      "@[The specification of function '%a' is currently not supported by Eva.@ \
        Consider adding '%a'@ to the analyzed source files.@]"
-      name Filepath.Normalized.pretty
+      Printer.pp_varname name Filepath.Normalized.pretty
       (Filepath.Normalized.concat System_config.Share.libc header)
   with Not_found -> ()
 
diff --git a/src/plugins/loop_analysis/tests/loop_analysis/oracle/with_value.res.oracle b/src/plugins/loop_analysis/tests/loop_analysis/oracle/with_value.res.oracle
index e94639819e8a0389153691fc04842e910cfeaaf0..ab4907a07edd6e624d5ffa77a6b07b9191b7dc71 100644
--- a/src/plugins/loop_analysis/tests/loop_analysis/oracle/with_value.res.oracle
+++ b/src/plugins/loop_analysis/tests/loop_analysis/oracle/with_value.res.oracle
@@ -6,56 +6,56 @@
   nondet ∈ [--..--]
 [eva] computing for function f1 <- main.
   Called from with_value.i:187.
-[eva] with_value.i:6: starting to merge loop iterations
+[eva:partition] with_value.i:6: starting to merge loop iterations
 [eva] Recording results for f1
 [eva] Done for function f1
 [eva] computing for function f2 <- main.
   Called from with_value.i:188.
-[eva] with_value.i:10: starting to merge loop iterations
+[eva:partition] with_value.i:10: starting to merge loop iterations
 [eva] Recording results for f2
 [eva] Done for function f2
 [eva] computing for function f3 <- main.
   Called from with_value.i:189.
-[eva] with_value.i:14: starting to merge loop iterations
+[eva:partition] with_value.i:14: starting to merge loop iterations
 [eva] Recording results for f3
 [eva] Done for function f3
 [eva] computing for function f4 <- main.
   Called from with_value.i:190.
-[eva] with_value.i:18: starting to merge loop iterations
+[eva:partition] with_value.i:18: starting to merge loop iterations
 [eva] Recording results for f4
 [eva] Done for function f4
 [eva] computing for function f5 <- main.
   Called from with_value.i:191.
-[eva] with_value.i:22: starting to merge loop iterations
+[eva:partition] with_value.i:22: starting to merge loop iterations
 [eva] Recording results for f5
 [eva] Done for function f5
 [eva] computing for function f6 <- main.
   Called from with_value.i:192.
-[eva] with_value.i:26: starting to merge loop iterations
+[eva:partition] with_value.i:26: starting to merge loop iterations
 [eva] Recording results for f6
 [eva] Done for function f6
 [eva] computing for function f7 <- main.
   Called from with_value.i:193.
-[eva] with_value.i:30: starting to merge loop iterations
+[eva:partition] with_value.i:30: starting to merge loop iterations
 [eva] Recording results for f7
 [eva] Done for function f7
 [eva] computing for function f8 <- main.
   Called from with_value.i:194.
-[eva] with_value.i:34: starting to merge loop iterations
+[eva:partition] with_value.i:34: starting to merge loop iterations
 [eva] Recording results for f8
 [eva] Done for function f8
 [eva] computing for function g1 <- main.
   Called from with_value.i:195.
 [eva:alarm] with_value.i:38: Warning: 
   signed overflow. assert n + 2 ≤ 2147483647;
-[eva] with_value.i:38: starting to merge loop iterations
+[eva:partition] with_value.i:38: starting to merge loop iterations
 [eva] Recording results for g1
 [eva] Done for function g1
 [eva] computing for function g2 <- main.
   Called from with_value.i:196.
 [eva:alarm] with_value.i:42: Warning: 
   signed overflow. assert n + 2 ≤ 2147483647;
-[eva] with_value.i:42: starting to merge loop iterations
+[eva:partition] with_value.i:42: starting to merge loop iterations
 [eva:alarm] with_value.i:42: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva] Recording results for g2
@@ -64,7 +64,7 @@
   Called from with_value.i:197.
 [eva:alarm] with_value.i:46: Warning: 
   signed overflow. assert n + 2 ≤ 2147483647;
-[eva] with_value.i:46: starting to merge loop iterations
+[eva:partition] with_value.i:46: starting to merge loop iterations
 [eva:alarm] with_value.i:46: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva] Recording results for g3
@@ -73,7 +73,7 @@
   Called from with_value.i:198.
 [eva:alarm] with_value.i:50: Warning: 
   signed overflow. assert n + 2 ≤ 2147483647;
-[eva] with_value.i:50: starting to merge loop iterations
+[eva:partition] with_value.i:50: starting to merge loop iterations
 [eva] Recording results for g4
 [eva] Done for function g4
 [eva] computing for function g5 <- main.
@@ -102,7 +102,7 @@
 [eva] Done for function g8
 [eva] computing for function h1 <- main.
   Called from with_value.i:203.
-[eva] with_value.i:70: starting to merge loop iterations
+[eva:partition] with_value.i:70: starting to merge loop iterations
 [eva] Recording results for h1
 [eva] Done for function h1
 [eva] computing for function h1 <- main.
@@ -111,7 +111,7 @@
 [eva] Done for function h1
 [eva] computing for function h2 <- main.
   Called from with_value.i:205.
-[eva] with_value.i:74: starting to merge loop iterations
+[eva:partition] with_value.i:74: starting to merge loop iterations
 [eva] Recording results for h2
 [eva] Done for function h2
 [eva] computing for function h2 <- main.
@@ -120,7 +120,7 @@
 [eva] Done for function h2
 [eva] computing for function h3 <- main.
   Called from with_value.i:207.
-[eva] with_value.i:78: starting to merge loop iterations
+[eva:partition] with_value.i:78: starting to merge loop iterations
 [eva] Recording results for h3
 [eva] Done for function h3
 [eva] computing for function h3 <- main.
@@ -129,7 +129,7 @@
 [eva] Done for function h3
 [eva] computing for function h4 <- main.
   Called from with_value.i:209.
-[eva] with_value.i:82: starting to merge loop iterations
+[eva:partition] with_value.i:82: starting to merge loop iterations
 [eva] Recording results for h4
 [eva] Done for function h4
 [eva] computing for function h4 <- main.
@@ -138,7 +138,7 @@
 [eva] Done for function h4
 [eva] computing for function h5 <- main.
   Called from with_value.i:211.
-[eva] with_value.i:86: starting to merge loop iterations
+[eva:partition] with_value.i:86: starting to merge loop iterations
 [eva] Recording results for h5
 [eva] Done for function h5
 [eva] computing for function h5 <- main.
@@ -147,7 +147,7 @@
 [eva] Done for function h5
 [eva] computing for function h6 <- main.
   Called from with_value.i:213.
-[eva] with_value.i:90: starting to merge loop iterations
+[eva:partition] with_value.i:90: starting to merge loop iterations
 [eva] Recording results for h6
 [eva] Done for function h6
 [eva] computing for function h6 <- main.
@@ -156,7 +156,7 @@
 [eva] Done for function h6
 [eva] computing for function h7 <- main.
   Called from with_value.i:215.
-[eva] with_value.i:94: starting to merge loop iterations
+[eva:partition] with_value.i:94: starting to merge loop iterations
 [eva] Recording results for h7
 [eva] Done for function h7
 [eva] computing for function h7 <- main.
@@ -165,7 +165,7 @@
 [eva] Done for function h7
 [eva] computing for function h8 <- main.
   Called from with_value.i:217.
-[eva] with_value.i:98: starting to merge loop iterations
+[eva:partition] with_value.i:98: starting to merge loop iterations
 [eva] Recording results for h8
 [eva] Done for function h8
 [eva] computing for function h8 <- main.
@@ -174,32 +174,32 @@
 [eva] Done for function h8
 [eva] computing for function i1 <- main.
   Called from with_value.i:219.
-[eva] with_value.i:102: starting to merge loop iterations
+[eva:partition] with_value.i:102: starting to merge loop iterations
 [eva] Recording results for i1
 [eva] Done for function i1
 [eva] computing for function i2 <- main.
   Called from with_value.i:220.
-[eva] with_value.i:106: starting to merge loop iterations
+[eva:partition] with_value.i:106: starting to merge loop iterations
 [eva] Recording results for i2
 [eva] Done for function i2
 [eva] computing for function i3 <- main.
   Called from with_value.i:221.
-[eva] with_value.i:110: starting to merge loop iterations
+[eva:partition] with_value.i:110: starting to merge loop iterations
 [eva] Recording results for i3
 [eva] Done for function i3
 [eva] computing for function i4 <- main.
   Called from with_value.i:222.
-[eva] with_value.i:114: starting to merge loop iterations
+[eva:partition] with_value.i:114: starting to merge loop iterations
 [eva] Recording results for i4
 [eva] Done for function i4
 [eva] computing for function j1 <- main.
   Called from with_value.i:223.
-[eva] with_value.i:118: starting to merge loop iterations
+[eva:partition] with_value.i:118: starting to merge loop iterations
 [eva] Recording results for j1
 [eva] Done for function j1
 [eva] computing for function j2 <- main.
   Called from with_value.i:224.
-[eva] with_value.i:122: starting to merge loop iterations
+[eva:partition] with_value.i:122: starting to merge loop iterations
 [eva] Recording results for j2
 [eva] Done for function j2
 [eva] computing for function j3 <- main.
@@ -220,99 +220,99 @@
 [eva] Done for function j2
 [eva] computing for function j3 <- main.
   Called from with_value.i:229.
-[eva] with_value.i:126: starting to merge loop iterations
+[eva:partition] with_value.i:126: starting to merge loop iterations
 [eva] Recording results for j3
 [eva] Done for function j3
 [eva] computing for function j4 <- main.
   Called from with_value.i:230.
-[eva] with_value.i:130: starting to merge loop iterations
+[eva:partition] with_value.i:130: starting to merge loop iterations
 [eva] Recording results for j4
 [eva] Done for function j4
 [eva] computing for function f2_u_const <- main.
   Called from with_value.i:232.
-[eva] with_value.i:134: starting to merge loop iterations
+[eva:partition] with_value.i:134: starting to merge loop iterations
 [eva] Recording results for f2_u_const
 [eva] Done for function f2_u_const
 [eva] computing for function ne1 <- main.
   Called from with_value.i:234.
-[eva] with_value.i:138: starting to merge loop iterations
+[eva:partition] with_value.i:138: starting to merge loop iterations
 [eva:alarm] with_value.i:138: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for ne1
 [eva] Done for function ne1
 [eva] computing for function ne2 <- main.
   Called from with_value.i:235.
-[eva] with_value.i:142: starting to merge loop iterations
+[eva:partition] with_value.i:142: starting to merge loop iterations
 [eva:alarm] with_value.i:142: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for ne2
 [eva] Done for function ne2
 [eva] computing for function ne3 <- main.
   Called from with_value.i:236.
-[eva] with_value.i:146: starting to merge loop iterations
+[eva:partition] with_value.i:146: starting to merge loop iterations
 [eva:alarm] with_value.i:146: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for ne3
 [eva] Done for function ne3
 [eva] computing for function ne4 <- main.
   Called from with_value.i:237.
-[eva] with_value.i:150: starting to merge loop iterations
+[eva:partition] with_value.i:150: starting to merge loop iterations
 [eva:alarm] with_value.i:150: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for ne4
 [eva] Done for function ne4
 [eva] computing for function nev1 <- main.
   Called from with_value.i:238.
-[eva] with_value.i:154: starting to merge loop iterations
+[eva:partition] with_value.i:154: starting to merge loop iterations
 [eva:alarm] with_value.i:154: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for nev1
 [eva] Done for function nev1
 [eva] computing for function nev2 <- main.
   Called from with_value.i:239.
-[eva] with_value.i:158: starting to merge loop iterations
+[eva:partition] with_value.i:158: starting to merge loop iterations
 [eva:alarm] with_value.i:158: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for nev2
 [eva] Done for function nev2
 [eva] computing for function nev3 <- main.
   Called from with_value.i:240.
-[eva] with_value.i:162: starting to merge loop iterations
+[eva:partition] with_value.i:162: starting to merge loop iterations
 [eva:alarm] with_value.i:162: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for nev3
 [eva] Done for function nev3
 [eva] computing for function nev4 <- main.
   Called from with_value.i:241.
-[eva] with_value.i:166: starting to merge loop iterations
+[eva:partition] with_value.i:166: starting to merge loop iterations
 [eva:alarm] with_value.i:166: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for nev4
 [eva] Done for function nev4
 [eva] computing for function nev5 <- main.
   Called from with_value.i:242.
-[eva] with_value.i:170: starting to merge loop iterations
+[eva:partition] with_value.i:170: starting to merge loop iterations
 [eva:alarm] with_value.i:170: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for nev5
 [eva] Done for function nev5
 [eva] computing for function nev6 <- main.
   Called from with_value.i:243.
-[eva] with_value.i:174: starting to merge loop iterations
+[eva:partition] with_value.i:174: starting to merge loop iterations
 [eva:alarm] with_value.i:174: Warning: 
   signed overflow. assert i + 4 ≤ 2147483647;
 [eva] Recording results for nev6
 [eva] Done for function nev6
 [eva] computing for function nev7 <- main.
   Called from with_value.i:244.
-[eva] with_value.i:178: starting to merge loop iterations
+[eva:partition] with_value.i:178: starting to merge loop iterations
 [eva:alarm] with_value.i:178: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for nev7
 [eva] Done for function nev7
 [eva] computing for function nev8 <- main.
   Called from with_value.i:245.
-[eva] with_value.i:182: starting to merge loop iterations
+[eva:partition] with_value.i:182: starting to merge loop iterations
 [eva:alarm] with_value.i:182: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for nev8
diff --git a/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle b/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle
index f8fc6e591f5a1e9604c8f6d20ef0cad5e39a22bd..9e8d5c9882775363382320109747d1a16c96e1d8 100644
--- a/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle
+++ b/src/plugins/markdown-report/tests/md/oracle/cwe126.res.oracle
@@ -2,14 +2,14 @@
 [eva] Analyzing a complete application starting at main
 [eva:initial-state] Values of globals at initialization
   
-[eva] cwe126.c:77: allocating variable __malloc_goodG2B_l77
+[eva:malloc:new] cwe126.c:77: allocating variable __malloc_goodG2B_l77
 [eva] using specification for function exit
 [eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
-[eva] cwe126.c:63: starting to merge loop iterations
-[eva] cwe126.c:41: 
+[eva:partition] cwe126.c:63: starting to merge loop iterations
+[eva:malloc:new] cwe126.c:41: 
   allocating variable __malloc_CWE126_Buffer_Overread__malloc_char_loop_64_bad_l41
-[eva] cwe126.c:27: starting to merge loop iterations
+[eva:partition] cwe126.c:27: starting to merge loop iterations
 [eva:alarm] cwe126.c:29: Warning: 
   out of bounds read. assert \valid_read(data + i);
 [eva] ====== VALUES COMPUTED ======
diff --git a/src/plugins/nonterm/tests/nonterm/oracle/n1.res.oracle b/src/plugins/nonterm/tests/nonterm/oracle/n1.res.oracle
index 3587b6cfbcb4a9f16c630dd9437bf96606f4c391..b7226e27c01f7d408aa28289736be4c8c002c61d 100644
--- a/src/plugins/nonterm/tests/nonterm/oracle/n1.res.oracle
+++ b/src/plugins/nonterm/tests/nonterm/oracle/n1.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] n1.i:6: starting to merge loop iterations
+[eva:partition] n1.i:6: starting to merge loop iterations
 [eva:alarm] n1.i:7: Warning: signed overflow. assert res + i ≤ 2147483647;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/src/plugins/nonterm/tests/nonterm/oracle/n7.res.oracle b/src/plugins/nonterm/tests/nonterm/oracle/n7.res.oracle
index c783a87aa6e454e3369e65891b12446426c21765..5749dc73e0a4f837a8cc8c98db58d10693637d6c 100644
--- a/src/plugins/nonterm/tests/nonterm/oracle/n7.res.oracle
+++ b/src/plugins/nonterm/tests/nonterm/oracle/n7.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] n7.i:5: starting to merge loop iterations
+[eva:partition] n7.i:5: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/src/plugins/variadic/tests/declared/oracle/redefine_anonymous_parameters.res.oracle b/src/plugins/variadic/tests/declared/oracle/redefine_anonymous_parameters.res.oracle
index 0c1758790c3f740c0277e62e36faf1c90bc09a1d..ea61b8a1a4d92c80cbafeb5d8e2d384304811fe3 100644
--- a/src/plugins/variadic/tests/declared/oracle/redefine_anonymous_parameters.res.oracle
+++ b/src/plugins/variadic/tests/declared/oracle/redefine_anonymous_parameters.res.oracle
@@ -7,7 +7,7 @@
 [variadic] redefine_anonymous_parameters.i:4: 
   Translating call to printf to a call to the specialized version printf_va_1.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   
diff --git a/src/plugins/variadic/tests/defined/oracle/multiple-va_start.res.oracle b/src/plugins/variadic/tests/defined/oracle/multiple-va_start.res.oracle
index 25efd1adf49148194cafd20f8e537c4a6edf7899..6180fce0e333f39acd01e005c1a2f63fec81e1d1 100644
--- a/src/plugins/variadic/tests/defined/oracle/multiple-va_start.res.oracle
+++ b/src/plugins/variadic/tests/defined/oracle/multiple-va_start.res.oracle
@@ -2,7 +2,7 @@
 [variadic] multiple-va_start.c:32: 
   Generic translation of call to variadic function.
 [eva] Analyzing a complete application starting at main
-[eva] multiple-va_start.c:20: allocating variable __malloc_pack_l20
+[eva:malloc:new] multiple-va_start.c:20: allocating variable __malloc_pack_l20
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function pack:
   __fc_heap_status ∈ [--..--]
diff --git a/src/plugins/variadic/tests/defined/oracle/va_copy.res.oracle b/src/plugins/variadic/tests/defined/oracle/va_copy.res.oracle
index 2092b713a5790e49bf7d2c478ff41f0dcd0f8580..4e0baaa971fddcf4b7482cd898ad96b315ebe758 100644
--- a/src/plugins/variadic/tests/defined/oracle/va_copy.res.oracle
+++ b/src/plugins/variadic/tests/defined/oracle/va_copy.res.oracle
@@ -1,7 +1,7 @@
 [variadic] va_copy.c:9: Declaration of variadic function pack.
 [variadic] va_copy.c:32: Generic translation of call to variadic function.
 [eva] Analyzing a complete application starting at main
-[eva] va_copy.c:21: allocating variable __malloc_pack_l21
+[eva:malloc:new] va_copy.c:21: allocating variable __malloc_pack_l21
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function pack:
   __fc_heap_status ∈ [--..--]
diff --git a/src/plugins/variadic/tests/known/oracle/exec.res.oracle b/src/plugins/variadic/tests/known/oracle/exec.res.oracle
index 03338e671a19f53d2f30031af1fd07be981405d3..1da3a3b77a3c13cd853560b8888d5e9d7842e666 100644
--- a/src/plugins/variadic/tests/known/oracle/exec.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/exec.res.oracle
@@ -42,7 +42,7 @@
 [kernel:annot:missing-spec] exec.c:15: Warning: 
   Neither code nor specification for function execlp_fallback_1,
    generating default assigns. See -generated-spec-* options for more info
-[eva] using specification for function execlp_fallback_1
+[eva] using specification for function execlp
 [eva:invalid-assigns] exec.c:15: 
   Completely invalid destination for assigns clause *(param1 + (0 ..)).
   Ignoring.
diff --git a/src/plugins/variadic/tests/known/oracle/fcntl.res.oracle b/src/plugins/variadic/tests/known/oracle/fcntl.res.oracle
index b15b13096bcb1e49c35dbeff48745f6d97a0f9ca..9448251dd8ba0be85ff72fcfde67e101411ceb66 100644
--- a/src/plugins/variadic/tests/known/oracle/fcntl.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/fcntl.res.oracle
@@ -40,7 +40,7 @@
 [kernel:annot:missing-spec] fcntl.c:16: Warning: 
   Neither code nor specification for function fcntl_fallback_1,
    generating default assigns. See -generated-spec-* options for more info
-[eva] using specification for function fcntl_fallback_1
+[eva] using specification for function fcntl
 [eva:alarm] fcntl.c:20: Warning: 
   function __va_fcntl_void: precondition 'cmd_has_void_arg' got status invalid.
 [eva:alarm] fcntl.c:24: Warning: 
@@ -48,7 +48,6 @@
 [kernel:annot:missing-spec] fcntl.c:28: Warning: 
   Neither code nor specification for function fcntl_fallback_2,
    generating default assigns. See -generated-spec-* options for more info
-[eva] using specification for function fcntl_fallback_2
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   fl ∈ [--..--] or UNINITIALIZED
diff --git a/src/plugins/variadic/tests/known/oracle/open.res.oracle b/src/plugins/variadic/tests/known/oracle/open.res.oracle
index ec407450fca075e637fbac4844156acce805af8d..89c49a920e72ce1dbf2d73951ed407554a4e8a16 100644
--- a/src/plugins/variadic/tests/known/oracle/open.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/open.res.oracle
@@ -24,7 +24,7 @@
 [kernel:annot:missing-spec] open.c:9: Warning: 
   Neither code nor specification for function open_fallback_1,
    generating default assigns. See -generated-spec-* options for more info
-[eva] using specification for function open_fallback_1
+[eva] using specification for function open
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   flag ∈ {0}
diff --git a/src/plugins/variadic/tests/known/oracle/open_wrong.res.oracle b/src/plugins/variadic/tests/known/oracle/open_wrong.res.oracle
index ae94f9c59c8d45aaec0c8e915db1fc6ea956ba44..338a8d81adae5d6022448a3e6cccec5ce8712eed 100644
--- a/src/plugins/variadic/tests/known/oracle/open_wrong.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/open_wrong.res.oracle
@@ -16,7 +16,7 @@
 [kernel:annot:missing-spec] open_wrong.c:13: Warning: 
   Neither code nor specification for function open_fallback_1,
    generating default assigns. See -generated-spec-* options for more info
-[eva] using specification for function open_fallback_1
+[eva] using specification for function open
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   file ∈ {{ "file" }}
diff --git a/src/plugins/variadic/tests/known/oracle/openat.res.oracle b/src/plugins/variadic/tests/known/oracle/openat.res.oracle
index e45e5dc8e0738d07fb9f66dbbfa7e08f2ccd5584..89a7c6689009511192f5e3a04d8cdfb04ed2cda7 100644
--- a/src/plugins/variadic/tests/known/oracle/openat.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/openat.res.oracle
@@ -23,7 +23,7 @@
 [kernel:annot:missing-spec] openat.c:10: Warning: 
   Neither code nor specification for function openat_fallback_1,
    generating default assigns. See -generated-spec-* options for more info
-[eva] using specification for function openat_fallback_1
+[eva] using specification for function openat
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   flag ∈ {0}
diff --git a/src/plugins/variadic/tests/known/oracle/printf.res.oracle b/src/plugins/variadic/tests/known/oracle/printf.res.oracle
index a567cee9c488f9d959f6468f74e8a83f50f11284..a4bc497d2519e7a7a1689ca4ddb35ae17826dbcc 100644
--- a/src/plugins/variadic/tests/known/oracle/printf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf.res.oracle
@@ -97,49 +97,17 @@
 [variadic] printf.c:80: 
   Translating call to printf to a call to the specialized version printf_va_32.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function printf_va_1
-[eva] using specification for function printf_va_2
-[eva] using specification for function printf_va_3
-[eva] using specification for function printf_va_4
-[eva] using specification for function printf_va_5
-[eva] using specification for function printf_va_6
-[eva] using specification for function printf_va_7
-[eva] using specification for function printf_va_8
-[eva] using specification for function printf_va_9
-[eva] using specification for function printf_va_10
-[eva] using specification for function printf_va_11
-[eva] using specification for function printf_va_12
-[eva] using specification for function printf_va_13
-[eva] using specification for function printf_va_14
-[eva] using specification for function printf_va_15
-[eva] using specification for function printf_va_16
-[eva] using specification for function printf_va_17
-[eva] using specification for function printf_va_18
-[eva] using specification for function printf_va_19
-[eva] using specification for function printf_va_20
-[eva] using specification for function printf_va_21
-[eva] using specification for function printf_va_22
-[eva] using specification for function printf_va_23
-[eva] using specification for function printf_va_24
-[eva] using specification for function printf_va_25
+[eva] using specification for function printf
 [eva:garbled-mix:assigns] printf.c:68: 
   The specification of function printf_va_25
   has generated a garbled mix of addresses
   for assigns clause __fc_stdout->__fc_FILE_data.
-[eva] using specification for function printf_va_26
 [kernel:annot:missing-spec] printf.c:71: Warning: 
   Neither code nor specification for function printf_fallback_1,
    generating default assigns. See -generated-spec-* options for more info
-[eva] using specification for function printf_fallback_1
 [eva:invalid-assigns] printf.c:71: 
   Completely invalid destination for assigns clause *(param1 + (0 ..)).
   Ignoring.
-[eva] using specification for function printf_va_27
-[eva] using specification for function printf_va_28
-[eva] using specification for function printf_va_29
-[eva] using specification for function printf_va_30
-[eva] using specification for function printf_va_31
-[eva] using specification for function printf_va_32
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   __fc_initial_stdout.__fc_FILE_id ∈ {1}
diff --git a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
index 445fabe655d1672e99748a164372a8a965992194..c17925d4c6c21eecf89043f7282d7dd9a51c8efa 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
@@ -23,7 +23,7 @@
   Assigning imprecise value to b because of arithmetic operation on addresses.
 [eva:alarm] printf_garbled_mix.c:7: Warning: 
   pointer downcast. assert (unsigned long)b ≤ 2147483647;
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] printf_garbled_mix.c:8: 
   Frama_C_show_each_nb_printed: [-2147483648..2147483647]
 [eva:garbled-mix:summary] 
diff --git a/src/plugins/variadic/tests/known/oracle/printf_redefined.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_redefined.res.oracle
index baa6412d4a5b978505a8ecb810d17e1851d42fc4..142e10dc722bcbc745694a6beb6b2151b6fb82a1 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_redefined.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_redefined.res.oracle
@@ -8,7 +8,7 @@
 [variadic:typing] printf_redefined.i:7: Warning: 
   Incorrect type for argument 2. The argument will be cast from long to size_t.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   x ∈ {0}
diff --git a/src/plugins/variadic/tests/known/oracle/printf_wrong_arity.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_wrong_arity.res.oracle
index ea0427acf1a58a496c767028060ed1e46870942b..04d622d2fc2c752591aafe1c8ff4160cc2fd5df0 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_wrong_arity.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_wrong_arity.res.oracle
@@ -27,11 +27,10 @@
 [variadic] printf_wrong_arity.c:9: 
   Fallback translation of call printf to a call to the specialized version printf_va_2_fallback_1.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [kernel:annot:missing-spec] printf_wrong_arity.c:9: Warning: 
   Neither code nor specification for function printf_va_2_fallback_1,
    generating default assigns. See -generated-spec-* options for more info
-[eva] using specification for function printf_va_2_fallback_1
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   __fc_initial_stdout.__fc_FILE_id ∈ {1}
diff --git a/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle
index d2d9c9511abba2f36d972b3aeaf2e921d2b08e24..1d78403904cda85aea0ce82caf9e367878e8fa47 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle
@@ -27,15 +27,11 @@
 [variadic] printf_wrong_pointers.c:18: 
   Translating call to printf to a call to the specialized version printf_va_5.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva:alarm] printf_wrong_pointers.c:14: Warning: 
   function printf_va_1: precondition \valid(param0) got status invalid.
-[eva] using specification for function printf_va_2
-[eva] using specification for function printf_va_3
 [eva:alarm] printf_wrong_pointers.c:16: Warning: 
   function printf_va_3: precondition \valid(param0) got status invalid.
-[eva] using specification for function printf_va_4
-[eva] using specification for function printf_va_5
 [eva:alarm] printf_wrong_pointers.c:18: Warning: 
   function printf_va_5: precondition valid_read_wstring(param0) got status invalid.
 [eva] ====== VALUES COMPUTED ======
diff --git a/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle
index 3e2d7c846202217c4e2c91b18884203efa9ce439..bcb991db71837e9e18c800ec19b55567d401f831 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_wrong_types.res.oracle
@@ -77,19 +77,7 @@
 [variadic:typing] printf_wrong_types.c:36: Warning: 
   Incorrect type for argument 2. The argument will be cast from RC (unsigned int) to int.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function printf_va_1
-[eva] using specification for function printf_va_2
-[eva] using specification for function printf_va_3
-[eva] using specification for function printf_va_4
-[eva] using specification for function printf_va_5
-[eva] using specification for function printf_va_6
-[eva] using specification for function printf_va_7
-[eva] using specification for function printf_va_8
-[eva] using specification for function printf_va_9
-[eva] using specification for function printf_va_10
-[eva] using specification for function printf_va_11
-[eva] using specification for function printf_va_12
-[eva] using specification for function printf_va_13
+[eva] using specification for function printf
 [eva:alarm] printf_wrong_types.c:30: Warning: 
   function printf_va_13: precondition valid_read_string(param0) got status invalid.
 [eva] ====== VALUES COMPUTED ======
@@ -484,19 +472,7 @@ int main(void)
 [variadic:typing] printf_wrong_types.c:36: Warning: 
   Incorrect type for argument 2. The argument will be cast from RC (unsigned int) to int.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function printf_va_1
-[eva] using specification for function printf_va_2
-[eva] using specification for function printf_va_3
-[eva] using specification for function printf_va_4
-[eva] using specification for function printf_va_5
-[eva] using specification for function printf_va_6
-[eva] using specification for function printf_va_7
-[eva] using specification for function printf_va_8
-[eva] using specification for function printf_va_9
-[eva] using specification for function printf_va_10
-[eva] using specification for function printf_va_11
-[eva] using specification for function printf_va_12
-[eva] using specification for function printf_va_13
+[eva] using specification for function printf
 [eva:alarm] printf_wrong_types.c:30: Warning: 
   function printf_va_13: precondition valid_read_string(param0) got status invalid.
 [eva] ====== VALUES COMPUTED ======
diff --git a/src/plugins/variadic/tests/known/oracle/scanf.0.res.oracle b/src/plugins/variadic/tests/known/oracle/scanf.0.res.oracle
index 1cc8b6672489b509deaf541592d6f3f95a6d2455..248c50d1d15d7eb7db08258bf8d0e79ec9d2277c 100644
--- a/src/plugins/variadic/tests/known/oracle/scanf.0.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/scanf.0.res.oracle
@@ -30,9 +30,7 @@
 [variadic] scanf.c:25: 
   Fallback translation of call scanf to a call to the specialized version scanf_fallback_1.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function scanf_va_1
-[eva] using specification for function scanf_va_2
-[eva] using specification for function scanf_va_3
+[eva] using specification for function scanf
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   c[0] ∈ [--..--]
diff --git a/src/plugins/variadic/tests/known/oracle/scanf.1.res.oracle b/src/plugins/variadic/tests/known/oracle/scanf.1.res.oracle
index 0e55f1c5d201a9af2a1536508d987734e8e52ac0..56f67a3e7e84e7db761315f18b17abc718a90877 100644
--- a/src/plugins/variadic/tests/known/oracle/scanf.1.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/scanf.1.res.oracle
@@ -25,9 +25,7 @@
 [variadic] scanf.c:25: 
   Translating call to scanf to a call to the specialized version scanf_va_4.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function scanf_va_1
-[eva] using specification for function scanf_va_2
-[eva] using specification for function scanf_va_3
+[eva] using specification for function scanf
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   c[0] ∈ [--..--]
diff --git a/src/plugins/variadic/tests/known/oracle/scanf_loop.res.oracle b/src/plugins/variadic/tests/known/oracle/scanf_loop.res.oracle
index 141acf793645b2ac10cea87ab44af1df01a7a8a1..a7bc2276d8b72d3ada9922e8bb10761ff5605a8e 100644
--- a/src/plugins/variadic/tests/known/oracle/scanf_loop.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/scanf_loop.res.oracle
@@ -19,7 +19,7 @@
 [variadic] scanf_loop.c:6: 
   Translating call to scanf to a call to the specialized version scanf_va_1.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function scanf_va_1
+[eva] using specification for function scanf
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   n ∈ [--..--]
diff --git a/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle b/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
index 457094451bc48c6506a531c7d10737ad667ec5dc..460100c536fcb2f404427758852b081ed56a3504 100644
--- a/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
@@ -23,7 +23,7 @@
 [eva] Analyzing a complete application starting at main
 [eva] FRAMAC_SHARE/libc/string.h:167: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function memset
-[eva] using specification for function snprintf_va_1
+[eva] using specification for function snprintf
 [eva] FRAMAC_SHARE/libc/stdio.h:250: 
   Cannot evaluate range bound format_length(format) - 1
   (unsupported ACSL construct: logic function format_length). Approximating
@@ -33,7 +33,6 @@
                                               (0 .. format_length(format) - 1)) got status unknown.
 [eva:alarm] snprintf.c:13: Warning: 
   assertion got status invalid (stopping propagation).
-[eva] using specification for function snprintf_va_2
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   data[0..98] ∈ {65}
diff --git a/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle b/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
index f395811f0709c44b3765d7ede71beff92d19153d..91a2158738fdc6557ebdfa23a888a44fffb84f7b 100644
--- a/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
@@ -34,7 +34,7 @@
   Translating call to swprintf to a call to the specialized version swprintf_va_2.
 [eva] Analyzing a complete application starting at main
 [eva] using specification for function wmemset
-[eva] using specification for function swprintf_va_1
+[eva] using specification for function swprintf
 [eva] FRAMAC_SHARE/libc/wchar.h:311: 
   Cannot evaluate range bound wformat_length(format) - 1
   (unsupported ACSL construct: logic function wformat_length). Approximating
@@ -44,7 +44,6 @@
                                               (0 .. wformat_length(format) - 1)) got status unknown.
 [eva:alarm] swprintf.c:13: Warning: 
   assertion got status invalid (stopping propagation).
-[eva] using specification for function swprintf_va_2
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   data[0..98] ∈ {65}
diff --git a/src/plugins/variadic/tests/known/oracle/wchar.res.oracle b/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
index 42d8e77e446bfcd9720dc3c732a3ce578cd463ad..ab7b545ce35b208ef5616bac861bce95dd5d4d8f 100644
--- a/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
@@ -49,16 +49,10 @@
 [variadic] wchar.c:23: 
   Translating call to swscanf to a call to the specialized version swscanf_va_1.
 [eva] Analyzing a complete application starting at main
-[eva] using specification for function wprintf_va_1
-[eva] using specification for function wprintf_va_2
-[eva] using specification for function wprintf_va_3
-[eva] using specification for function wprintf_va_4
-[eva] using specification for function wprintf_va_5
-[eva] using specification for function wprintf_va_6
-[eva] using specification for function swprintf_va_1
-[eva] using specification for function wscanf_va_1
-[eva] using specification for function wscanf_va_2
-[eva] using specification for function swscanf_va_1
+[eva] using specification for function wprintf
+[eva] using specification for function swprintf
+[eva] using specification for function wscanf
+[eva] using specification for function swscanf
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   input[0] ∈ {102}
diff --git a/tests/builtins/oracle/alloc-vla.res.oracle b/tests/builtins/oracle/alloc-vla.res.oracle
index 36507d1fe072debf9b909dc6e1715478cb5917a9..9ca582251ec2a091ba7502d7b0219ae1422527a0 100644
--- a/tests/builtins/oracle/alloc-vla.res.oracle
+++ b/tests/builtins/oracle/alloc-vla.res.oracle
@@ -8,7 +8,7 @@
   Called from alloc-vla.c:12.
 [eva] alloc-vla.c:6: assertion 'alloca_bounds' got status valid.
 [eva] alloc-vla.c:6: Call to builtin __fc_vla_alloc
-[eva] alloc-vla.c:6: allocating variable __malloc_f_l6
+[eva:malloc:new] alloc-vla.c:6: allocating variable __malloc_f_l6
 [eva] alloc-vla.c:7: Call to builtin free
 [eva:alarm] alloc-vla.c:7: Warning: 
   function free: precondition 'freeable' got status invalid.
diff --git a/tests/builtins/oracle/alloc.0.res.oracle b/tests/builtins/oracle/alloc.0.res.oracle
index 54ebc9370407aa50dfdd282b12401f88086ce3a4..822782fce6b9cff2cda81432abc180da1682fa22 100644
--- a/tests/builtins/oracle/alloc.0.res.oracle
+++ b/tests/builtins/oracle/alloc.0.res.oracle
@@ -13,9 +13,9 @@
   v ∈ {0}
   ch ∈ {44}
 [eva] alloc.c:16: Call to builtin malloc
-[eva] alloc.c:16: allocating variable __malloc_main_l16
+[eva:malloc:new] alloc.c:16: allocating variable __malloc_main_l16
 [eva] alloc.c:17: Call to builtin malloc
-[eva] alloc.c:17: allocating variable __malloc_main_l17
+[eva:malloc:new] alloc.c:17: allocating variable __malloc_main_l17
 [eva:alarm] alloc.c:18: Warning: 
   out of bounds write. assert \valid(p + (int)(-1));
 [kernel] alloc.c:18: Warning: 
@@ -31,7 +31,7 @@
 [kernel] alloc.c:21: Warning: 
   all target addresses were invalid. This path is assumed to be dead.
 [eva] alloc.c:25: Call to builtin malloc
-[eva] alloc.c:25: allocating variable __malloc_main_l25
+[eva:malloc:new] alloc.c:25: allocating variable __malloc_main_l25
 [eva:alarm] alloc.c:26: Warning: 
   pointer downcast. assert (unsigned int)q ≤ 2147483647;
 [eva:alarm] alloc.c:26: Warning: 
@@ -43,9 +43,9 @@
 [eva:alarm] alloc.c:27: Warning: out of bounds write. assert \valid(r);
 [eva:alarm] alloc.c:27: Warning: out of bounds read. assert \valid_read(r + 1);
 [eva] alloc.c:32: Call to builtin malloc
-[eva] alloc.c:32: allocating variable __malloc_main_l32
+[eva:malloc:new] alloc.c:32: allocating variable __malloc_main_l32
 [eva] alloc.c:33: Call to builtin malloc
-[eva] alloc.c:33: allocating variable __malloc_main_l33
+[eva:malloc:new] alloc.c:33: allocating variable __malloc_main_l33
 [eva:alarm] alloc.c:34: Warning: out of bounds write. assert \valid(u);
 [eva:alarm] alloc.c:35: Warning: out of bounds write. assert \valid(u);
 [eva:alarm] alloc.c:36: Warning: out of bounds write. assert \valid(u + 1);
diff --git a/tests/builtins/oracle/alloc.1.res.oracle b/tests/builtins/oracle/alloc.1.res.oracle
index 9d78cea78ca65f7bb53f13c7d32484b97ff680e7..4d22c5ce69c927f1d012c7b7cfa1cfa50e8641f7 100644
--- a/tests/builtins/oracle/alloc.1.res.oracle
+++ b/tests/builtins/oracle/alloc.1.res.oracle
@@ -14,7 +14,7 @@
   v ∈ {0}
   ch ∈ {44}
 [eva] alloc.c:50: Call to builtin malloc
-[eva] alloc.c:50: allocating variable __malloc_main_abs_l50
+[eva:malloc:new] alloc.c:50: allocating variable __malloc_main_abs_l50
 [eva:alarm] alloc.c:51: Warning: 
   pointer downcast. assert (unsigned int)q ≤ 2147483647;
 [eva:alarm] alloc.c:51: Warning: 
diff --git a/tests/builtins/oracle/alloc_weak.res.oracle b/tests/builtins/oracle/alloc_weak.res.oracle
index f13229d6c2385c240cbec47ca4b06a11c4088c2e..492d56d769e1235e66ae35be032188248af4819a 100644
--- a/tests/builtins/oracle/alloc_weak.res.oracle
+++ b/tests/builtins/oracle/alloc_weak.res.oracle
@@ -9,7 +9,7 @@
 [eva] computing for function main1 <- main.
   Called from alloc_weak.c:93.
 [eva] alloc_weak.c:23: Call to builtin malloc
-[eva] alloc_weak.c:23: allocating variable __malloc_main1_l23
+[eva:malloc:new] alloc_weak.c:23: allocating variable __malloc_main1_l23
 [eva] alloc_weak.c:23: Call to builtin malloc
 [eva:malloc:weak] alloc_weak.c:23: marking variable `__malloc_main1_l23' as weak
 [eva] computing for function copy <- main1 <- main.
@@ -38,26 +38,26 @@
 [eva] computing for function main2 <- main.
   Called from alloc_weak.c:94.
 [eva] alloc_weak.c:37: Call to builtin malloc
-[eva] alloc_weak.c:37: allocating variable __malloc_main2_l37
+[eva:malloc:new] alloc_weak.c:37: allocating variable __malloc_main2_l37
 [eva:alarm] alloc_weak.c:37: Warning: 
   pointer downcast.
   assert (unsigned int)tmp ≤ 2147483647;
   (tmp from malloc(sizeof(int)))
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 100 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 200 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 300 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 400 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 500 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 600 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 700 states
-[eva] alloc_weak.c:40: Trace partitioning superposing up to 800 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 100 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 200 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 300 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 400 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 500 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 600 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 700 states
+[eva:partition] alloc_weak.c:40: Trace partitioning superposing up to 800 states
 [eva] Recording results for main2
 [eva] Done for function main2
 [eva] computing for function main3 <- main.
   Called from alloc_weak.c:95.
 [eva] alloc_weak.c:51: Call to builtin malloc
-[eva] alloc_weak.c:51: allocating variable __malloc_main3_l51
-[eva] alloc_weak.c:50: starting to merge loop iterations
+[eva:malloc:new] alloc_weak.c:51: allocating variable __malloc_main3_l51
+[eva:partition] alloc_weak.c:50: starting to merge loop iterations
 [eva] alloc_weak.c:51: Call to builtin malloc
 [eva:malloc:weak] alloc_weak.c:51: marking variable `__malloc_main3_l51' as weak
 [eva] alloc_weak.c:51: Call to builtin malloc
@@ -75,10 +75,12 @@
 [eva] computing for function convergence_issue <- main.
   Called from alloc_weak.c:96.
 [eva] alloc_weak.c:73: Call to builtin calloc
-[eva] alloc_weak.c:73: allocating variable __calloc_convergence_issue_l73
+[eva:malloc:new] alloc_weak.c:73: 
+  allocating variable __calloc_convergence_issue_l73
 [eva] alloc_weak.c:82: Call to builtin calloc
-[eva] alloc_weak.c:82: allocating variable __calloc_convergence_issue_l82
-[eva] alloc_weak.c:74: starting to merge loop iterations
+[eva:malloc:new] alloc_weak.c:82: 
+  allocating variable __calloc_convergence_issue_l82
+[eva:partition] alloc_weak.c:74: starting to merge loop iterations
 [eva:alarm] alloc_weak.c:80: Warning: 
   out of bounds read. assert \valid_read((p + size) - 1);
 [eva] alloc_weak.c:82: Call to builtin calloc
diff --git a/tests/builtins/oracle/allocated.0.res.oracle b/tests/builtins/oracle/allocated.0.res.oracle
index f3305d57c0ac3d060c401a431f8663734b519707..af7856ce675d6e4f6a15c0dfcace9c92a3c159aa 100644
--- a/tests/builtins/oracle/allocated.0.res.oracle
+++ b/tests/builtins/oracle/allocated.0.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   nondet ∈ [--..--]
 [eva] allocated.c:25: Call to builtin malloc
-[eva] allocated.c:25: allocating variable __malloc_main_l25
+[eva:malloc:new] allocated.c:25: allocating variable __malloc_main_l25
 [eva] allocated.c:25: assertion got status valid.
 [eva:alarm] allocated.c:27: Warning: 
   out of bounds read. assert \valid_read(p + 1);
@@ -18,7 +18,7 @@
 [eva:malloc] allocated.c:31: strong free on bases: {__malloc_main_l25}
 [eva] allocated.c:32: Frama_C_show_each_p_after_free: ⊥
 [eva] allocated.c:36: Call to builtin malloc
-[eva] allocated.c:36: allocating variable __malloc_main_l36
+[eva:malloc:new] allocated.c:36: allocating variable __malloc_main_l36
 [eva] allocated.c:36: assertion got status valid.
 [eva] allocated.c:40: Frama_C_show_each_p: {{ &__malloc_main_l36 }}
 [eva] allocated.c:41: Frama_C_show_each_p0: {13}
@@ -38,7 +38,7 @@
 [kernel] allocated.c:46: Warning: 
   all target addresses were invalid. This path is assumed to be dead.
 [eva] allocated.c:50: Call to builtin malloc
-[eva] allocated.c:50: allocating variable __malloc_main_l50
+[eva:malloc:new] allocated.c:50: allocating variable __malloc_main_l50
 [eva] allocated.c:50: assertion got status valid.
 [eva:alarm] allocated.c:53: Warning: out of bounds write. assert \valid(p + 2);
 [eva] allocated.c:54: Frama_C_show_each_p: {{ &__malloc_main_l50 }}
@@ -49,7 +49,7 @@
 [eva] allocated.c:58: function free: precondition 'freeable' got status valid.
 [eva:malloc] allocated.c:58: strong free on bases: {__malloc_main_l50}
 [eva] allocated.c:63: Call to builtin malloc
-[eva] allocated.c:63: allocating variable __malloc_main_l63
+[eva:malloc:new] allocated.c:63: allocating variable __malloc_main_l63
 [eva] allocated.c:63: assertion got status valid.
 [eva] allocated.c:65: Frama_C_show_each_p: {{ &__malloc_main_l63 }}
 [eva] allocated.c:66: Frama_C_show_each_p0: {0}
@@ -72,7 +72,7 @@
 [eva] allocated.c:67: Call to builtin free
 [eva:malloc] allocated.c:67: strong free on bases: {__malloc_main_l63}
 [eva] allocated.c:73: Call to builtin malloc
-[eva] allocated.c:73: allocating variable __malloc_main_l73
+[eva:malloc:new] allocated.c:73: allocating variable __malloc_main_l73
 [eva] allocated.c:75: Frama_C_show_each_p: {{ &__malloc_main_l73 }}
 [eva] allocated.c:76: Frama_C_show_each_p0: {0}
 [eva] allocated.c:77: Call to builtin free
@@ -83,7 +83,7 @@
 [eva] allocated.c:76: Frama_C_show_each_p0: {1}
 [eva] allocated.c:77: Call to builtin free
 [eva:malloc] allocated.c:77: strong free on bases: {__malloc_main_l73}
-[eva] allocated.c:72: starting to merge loop iterations
+[eva:partition] allocated.c:72: starting to merge loop iterations
 [eva] allocated.c:73: Call to builtin malloc
 [eva] allocated.c:75: Frama_C_show_each_p: {{ &__malloc_main_l73 }}
 [eva] allocated.c:76: Frama_C_show_each_p0: {1; 2}
@@ -95,7 +95,7 @@
 [eva] allocated.c:77: Call to builtin free
 [eva:malloc] allocated.c:77: strong free on bases: {__malloc_main_l73}
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82
 [eva] allocated.c:82: assertion got status valid.
 [eva] allocated.c:87: Call to builtin free
 [eva] allocated.c:87: function free: precondition 'freeable' got status valid.
@@ -105,10 +105,10 @@
 [eva:malloc] allocated.c:82: 
   resizing variable `__malloc_w_main_l82' (0..-1) to fit 0..31
 [eva:alarm] allocated.c:85: Warning: out of bounds write. assert \valid(p + j);
-[eva] allocated.c:84: starting to merge loop iterations
+[eva:partition] allocated.c:84: starting to merge loop iterations
 [eva] allocated.c:87: Call to builtin free
 [eva:malloc] allocated.c:87: weak free on bases: {__malloc_w_main_l82}
-[eva] allocated.c:81: starting to merge loop iterations
+[eva:partition] allocated.c:81: starting to merge loop iterations
 [eva] allocated.c:82: Call to builtin malloc
 [eva:malloc] allocated.c:82: 
   resizing variable `__malloc_w_main_l82' (0..-1/31) to fit 0..31/63
@@ -123,14 +123,14 @@
 [eva:malloc] allocated.c:82: 
   resizing variable `__malloc_w_main_l82' (0..-1/95) to fit 0..31/95
 [eva] allocated.c:91: Call to builtin malloc
-[eva] allocated.c:91: allocating variable __malloc_main_l91
+[eva:malloc:new] allocated.c:91: allocating variable __malloc_main_l91
 [eva] allocated.c:91: assertion got status valid.
 [eva] allocated.c:92: Call to builtin free
 [eva] allocated.c:92: function free: precondition 'freeable' got status valid.
 [eva:malloc] allocated.c:92: strong free on bases: {__malloc_main_l91}
 [eva:alarm] allocated.c:96: Warning: assertion 'Assume' got status unknown.
 [eva] allocated.c:97: Call to builtin malloc
-[eva] allocated.c:97: allocating variable __malloc_main_l97
+[eva:malloc:new] allocated.c:97: allocating variable __malloc_main_l97
 [eva] allocated.c:97: Frama_C_show_each: {{ &__malloc_main_l97 }}
 [eva:alarm] allocated.c:98: Warning: out of bounds write. assert \valid(p);
 [eva] allocated.c:110: Frama_C_show_each: {0}
@@ -139,7 +139,7 @@
 [eva:malloc] allocated.c:111: strong free on bases: {__malloc_main_l97}
 [eva:alarm] allocated.c:113: Warning: assertion got status unknown.
 [eva] allocated.c:114: Call to builtin malloc
-[eva] allocated.c:114: allocating variable __malloc_main_l114
+[eva:malloc:new] allocated.c:114: allocating variable __malloc_main_l114
 [eva] allocated.c:114: Frama_C_show_each: {{ &__malloc_main_l114 }}
 [eva:alarm] allocated.c:115: Warning: out of bounds write. assert \valid(p);
 [eva] allocated.c:117: Frama_C_show_each: {0}
@@ -147,7 +147,7 @@
 [eva] allocated.c:118: function free: precondition 'freeable' got status valid.
 [eva:malloc] allocated.c:118: strong free on bases: {__malloc_main_l114}
 [eva] allocated.c:120: Call to builtin malloc
-[eva] allocated.c:120: allocating variable __malloc_main_l120
+[eva:malloc:new] allocated.c:120: allocating variable __malloc_main_l120
 [eva] allocated.c:120: Frama_C_show_each: {{ &__malloc_main_l120 }}
 [eva] allocated.c:123: Frama_C_show_each: ⊥
 [eva] allocated.c:125: Call to builtin free
@@ -155,19 +155,19 @@
 [eva:malloc] allocated.c:125: strong free on bases: {__malloc_main_l120}
 [eva] allocated.c:127: assertion 'alloca_bounds' got status valid.
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127
 [eva] allocated.c:131: Frama_C_show_each: {0}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
 [eva:malloc] allocated.c:127: 
   resizing variable `__malloc_main_l127' (0..31) to fit 0..63
-[eva] allocated.c:128: starting to merge loop iterations
+[eva:partition] allocated.c:128: starting to merge loop iterations
 [eva:alarm] allocated.c:129: Warning: out of bounds write. assert \valid(a + j);
 [eva] allocated.c:131: Frama_C_show_each: {0; 1}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127}
-[eva] allocated.c:126: starting to merge loop iterations
+[eva:partition] allocated.c:126: starting to merge loop iterations
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
 [eva:malloc] allocated.c:127: 
   resizing variable `__malloc_main_l127' (0..31/63) to fit 0..63/95
diff --git a/tests/builtins/oracle/allocated.1.res.oracle b/tests/builtins/oracle/allocated.1.res.oracle
index b214327bf47de57ddda39e5422b6450e38f6f5e9..3c1ba912ce86d54b9212e2ef91ad47a2a350db9c 100644
--- a/tests/builtins/oracle/allocated.1.res.oracle
+++ b/tests/builtins/oracle/allocated.1.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   nondet ∈ [--..--]
 [eva] allocated.c:25: Call to builtin malloc
-[eva] allocated.c:25: allocating variable __malloc_main_l25
+[eva:malloc:new] allocated.c:25: allocating variable __malloc_main_l25
 [eva] allocated.c:25: assertion got status valid.
 [eva:alarm] allocated.c:27: Warning: 
   out of bounds read. assert \valid_read(p + 1);
@@ -18,7 +18,7 @@
 [eva:malloc] allocated.c:31: strong free on bases: {__malloc_main_l25}
 [eva] allocated.c:32: Frama_C_show_each_p_after_free: ⊥
 [eva] allocated.c:36: Call to builtin malloc
-[eva] allocated.c:36: allocating variable __malloc_main_l36
+[eva:malloc:new] allocated.c:36: allocating variable __malloc_main_l36
 [eva] allocated.c:36: assertion got status valid.
 [eva] allocated.c:40: Frama_C_show_each_p: {{ &__malloc_main_l36 }}
 [eva] allocated.c:41: Frama_C_show_each_p0: {13}
@@ -40,9 +40,9 @@
 [kernel] allocated.c:46: Warning: 
   all target addresses were invalid. This path is assumed to be dead.
 [eva] allocated.c:50: Call to builtin malloc
-[eva] allocated.c:50: allocating variable __malloc_main_l50
+[eva:malloc:new] allocated.c:50: allocating variable __malloc_main_l50
 [eva] allocated.c:50: Call to builtin malloc
-[eva] allocated.c:50: allocating variable __malloc_main_l50_0
+[eva:malloc:new] allocated.c:50: allocating variable __malloc_main_l50_0
 [eva] allocated.c:50: assertion got status valid.
 [eva:alarm] allocated.c:53: Warning: out of bounds write. assert \valid(p + 2);
 [kernel] allocated.c:53: Warning: 
@@ -55,7 +55,7 @@
 [eva] allocated.c:58: function free: precondition 'freeable' got status valid.
 [eva:malloc] allocated.c:58: strong free on bases: {__malloc_main_l50_0}
 [eva] allocated.c:63: Call to builtin malloc
-[eva] allocated.c:63: allocating variable __malloc_main_l63
+[eva:malloc:new] allocated.c:63: allocating variable __malloc_main_l63
 [eva] allocated.c:63: assertion got status valid.
 [eva] allocated.c:65: Frama_C_show_each_p: {{ &__malloc_main_l63 }}
 [eva] allocated.c:66: Frama_C_show_each_p0: {0}
@@ -63,58 +63,58 @@
 [eva] allocated.c:67: function free: precondition 'freeable' got status valid.
 [eva:malloc] allocated.c:67: strong free on bases: {__malloc_main_l63}
 [eva] allocated.c:63: Call to builtin malloc
-[eva] allocated.c:63: allocating variable __malloc_main_l63_0
+[eva:malloc:new] allocated.c:63: allocating variable __malloc_main_l63_0
 [eva] allocated.c:65: Frama_C_show_each_p: {{ &__malloc_main_l63_0 }}
 [eva] allocated.c:66: Frama_C_show_each_p0: {1}
 [eva] allocated.c:67: Call to builtin free
 [eva:malloc] allocated.c:67: strong free on bases: {__malloc_main_l63_0}
 [eva] allocated.c:63: Call to builtin malloc
-[eva] allocated.c:63: allocating variable __malloc_main_l63_1
+[eva:malloc:new] allocated.c:63: allocating variable __malloc_main_l63_1
 [eva] allocated.c:65: Frama_C_show_each_p: {{ &__malloc_main_l63_1 }}
 [eva] allocated.c:66: Frama_C_show_each_p0: {2}
 [eva] allocated.c:67: Call to builtin free
 [eva:malloc] allocated.c:67: strong free on bases: {__malloc_main_l63_1}
 [eva] allocated.c:63: Call to builtin malloc
-[eva] allocated.c:63: allocating variable __malloc_main_l63_2
+[eva:malloc:new] allocated.c:63: allocating variable __malloc_main_l63_2
 [eva] allocated.c:65: Frama_C_show_each_p: {{ &__malloc_main_l63_2 }}
 [eva] allocated.c:66: Frama_C_show_each_p0: {3}
 [eva] allocated.c:67: Call to builtin free
 [eva:malloc] allocated.c:67: strong free on bases: {__malloc_main_l63_2}
 [eva] allocated.c:73: Call to builtin malloc
-[eva] allocated.c:73: allocating variable __malloc_main_l73
+[eva:malloc:new] allocated.c:73: allocating variable __malloc_main_l73
 [eva] allocated.c:75: Frama_C_show_each_p: {{ &__malloc_main_l73 }}
 [eva] allocated.c:76: Frama_C_show_each_p0: {0}
 [eva] allocated.c:77: Call to builtin free
 [eva] allocated.c:77: function free: precondition 'freeable' got status valid.
 [eva:malloc] allocated.c:77: strong free on bases: {__malloc_main_l73}
 [eva] allocated.c:73: Call to builtin malloc
-[eva] allocated.c:73: allocating variable __malloc_main_l73_0
+[eva:malloc:new] allocated.c:73: allocating variable __malloc_main_l73_0
 [eva] allocated.c:75: Frama_C_show_each_p: {{ &__malloc_main_l73_0 }}
 [eva] allocated.c:76: Frama_C_show_each_p0: {1}
 [eva] allocated.c:77: Call to builtin free
 [eva:malloc] allocated.c:77: strong free on bases: {__malloc_main_l73_0}
 [eva] allocated.c:73: Call to builtin malloc
-[eva] allocated.c:73: allocating variable __malloc_main_l73_1
+[eva:malloc:new] allocated.c:73: allocating variable __malloc_main_l73_1
 [eva] allocated.c:75: Frama_C_show_each_p: {{ &__malloc_main_l73_1 }}
 [eva] allocated.c:76: Frama_C_show_each_p0: {2}
 [eva] allocated.c:77: Call to builtin free
 [eva:malloc] allocated.c:77: strong free on bases: {__malloc_main_l73_1}
 [eva] allocated.c:73: Call to builtin malloc
-[eva] allocated.c:73: allocating variable __malloc_main_l73_2
+[eva:malloc:new] allocated.c:73: allocating variable __malloc_main_l73_2
 [eva] allocated.c:75: Frama_C_show_each_p: {{ &__malloc_main_l73_2 }}
 [eva] allocated.c:76: Frama_C_show_each_p0: {3}
 [eva] allocated.c:77: Call to builtin free
 [eva:malloc] allocated.c:77: strong free on bases: {__malloc_main_l73_2}
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82
 [eva] allocated.c:82: assertion got status valid.
 [eva] allocated.c:87: Call to builtin free
 [eva] allocated.c:87: function free: precondition 'freeable' got status valid.
 [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82}
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_0
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_0
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_1
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_1
 [eva] allocated.c:87: Call to builtin free
 [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_1}
 [eva] allocated.c:87: Call to builtin free
@@ -124,15 +124,15 @@
 [eva] allocated.c:87: Call to builtin free
 [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_0}
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_2
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_2
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_3
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_3
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_4
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_4
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_5
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_5
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_6
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_6
 [eva] allocated.c:87: Call to builtin free
 [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_2}
 [eva] allocated.c:87: Call to builtin free
@@ -174,57 +174,57 @@
 [eva] allocated.c:87: Call to builtin free
 [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_6}
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_7
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_8
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_8
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_9
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_9
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_10
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_10
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_11
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_11
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_12
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_12
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_13
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_13
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_14
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_14
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_15
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_15
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_16
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_16
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_17
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_17
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_18
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_18
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_19
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_19
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_20
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_20
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_21
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_21
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_22
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_22
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_23
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_23
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_24
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_24
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_25
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_25
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_26
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_26
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_27
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_27
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_28
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_28
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_29
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_29
 [eva] allocated.c:82: Call to builtin malloc
-[eva] allocated.c:82: allocating variable __malloc_main_l82_30
-[eva] allocated.c:84: Trace partitioning superposing up to 100 states
-[eva] allocated.c:84: Trace partitioning superposing up to 200 states
-[eva] allocated.c:84: Trace partitioning superposing up to 300 states
-[eva] allocated.c:84: Trace partitioning superposing up to 400 states
+[eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_30
+[eva:partition] allocated.c:84: Trace partitioning superposing up to 100 states
+[eva:partition] allocated.c:84: Trace partitioning superposing up to 200 states
+[eva:partition] allocated.c:84: Trace partitioning superposing up to 300 states
+[eva:partition] allocated.c:84: Trace partitioning superposing up to 400 states
 [eva] allocated.c:87: Call to builtin free
 [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_30}
 [eva] allocated.c:87: Call to builtin free
@@ -610,14 +610,14 @@
 [eva] allocated.c:87: Call to builtin free
 [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 [eva] allocated.c:91: Call to builtin malloc
-[eva] allocated.c:91: allocating variable __malloc_main_l91
+[eva:malloc:new] allocated.c:91: allocating variable __malloc_main_l91
 [eva] allocated.c:91: assertion got status valid.
 [eva] allocated.c:92: Call to builtin free
 [eva] allocated.c:92: function free: precondition 'freeable' got status valid.
 [eva:malloc] allocated.c:92: strong free on bases: {__malloc_main_l91}
 [eva:alarm] allocated.c:96: Warning: assertion 'Assume' got status unknown.
 [eva] allocated.c:97: Call to builtin malloc
-[eva] allocated.c:97: allocating variable __malloc_main_l97
+[eva:malloc:new] allocated.c:97: allocating variable __malloc_main_l97
 [eva] allocated.c:97: Frama_C_show_each: {{ &__malloc_main_l97 }}
 [eva:alarm] allocated.c:98: Warning: out of bounds write. assert \valid(p);
 [eva] allocated.c:110: Frama_C_show_each: {0}
@@ -626,7 +626,7 @@
 [eva:malloc] allocated.c:111: strong free on bases: {__malloc_main_l97}
 [eva:alarm] allocated.c:113: Warning: assertion got status unknown.
 [eva] allocated.c:114: Call to builtin malloc
-[eva] allocated.c:114: allocating variable __malloc_main_l114
+[eva:malloc:new] allocated.c:114: allocating variable __malloc_main_l114
 [eva] allocated.c:114: Frama_C_show_each: {{ &__malloc_main_l114 }}
 [eva:alarm] allocated.c:115: Warning: out of bounds write. assert \valid(p);
 [eva] allocated.c:117: Frama_C_show_each: {0}
@@ -634,7 +634,7 @@
 [eva] allocated.c:118: function free: precondition 'freeable' got status valid.
 [eva:malloc] allocated.c:118: strong free on bases: {__malloc_main_l114}
 [eva] allocated.c:120: Call to builtin malloc
-[eva] allocated.c:120: allocating variable __malloc_main_l120
+[eva:malloc:new] allocated.c:120: allocating variable __malloc_main_l120
 [eva] allocated.c:120: Frama_C_show_each: {{ &__malloc_main_l120 }}
 [eva] allocated.c:123: Frama_C_show_each: ⊥
 [eva] allocated.c:125: Call to builtin free
@@ -642,52 +642,52 @@
 [eva:malloc] allocated.c:125: strong free on bases: {__malloc_main_l120}
 [eva] allocated.c:127: assertion 'alloca_bounds' got status valid.
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127
 [eva] allocated.c:131: Frama_C_show_each: {0}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127_0
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127_0
 [eva] allocated.c:131: Frama_C_show_each: {1}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127_0}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127_1
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127_1
 [eva] allocated.c:131: Frama_C_show_each: {2}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127_1}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127_2
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127_2
 [eva] allocated.c:131: Frama_C_show_each: {3}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127_2}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127_3
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127_3
 [eva] allocated.c:131: Frama_C_show_each: {4}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127_3}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127_4
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127_4
 [eva] allocated.c:131: Frama_C_show_each: {5}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127_4}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127_5
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127_5
 [eva] allocated.c:131: Frama_C_show_each: {6}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127_5}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127_6
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127_6
 [eva] allocated.c:131: Frama_C_show_each: {7}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127_6}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127_7
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127_7
 [eva] allocated.c:131: Frama_C_show_each: {8}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127_7}
 [eva] allocated.c:127: Call to builtin __fc_vla_alloc
-[eva] allocated.c:127: allocating variable __malloc_main_l127_8
+[eva:malloc:new] allocated.c:127: allocating variable __malloc_main_l127_8
 [eva] allocated.c:131: Frama_C_show_each: {9}
 [eva] allocated.c:127: Call to builtin __fc_vla_free
 [eva:malloc] allocated.c:127: strong free on bases: {__malloc_main_l127_8}
diff --git a/tests/builtins/oracle/calloc.1.res.oracle b/tests/builtins/oracle/calloc.1.res.oracle
index dd49f843488cfe7ea2005f439f15496342dc0d3a..aeadce0c13d2f98c6590bbe56f45969b6ae4c291 100644
--- a/tests/builtins/oracle/calloc.1.res.oracle
+++ b/tests/builtins/oracle/calloc.1.res.oracle
@@ -5,17 +5,17 @@
 [eva:initial-state] Values of globals at initialization
   nondet ∈ [--..--]
 [eva] calloc.c:14: Call to builtin calloc
-[eva] calloc.c:14: allocating variable __calloc_main_l14
+[eva:malloc:new] calloc.c:14: allocating variable __calloc_main_l14
 [eva] calloc.c:17: Call to builtin calloc
-[eva] calloc.c:17: allocating variable __calloc_main_l17
+[eva:malloc:new] calloc.c:17: allocating variable __calloc_main_l17
 [eva] calloc.c:20: Call to builtin calloc
-[eva] calloc.c:20: allocating variable __calloc_main_l20
+[eva:malloc:new] calloc.c:20: allocating variable __calloc_main_l20
 [eva] calloc.c:23: Call to builtin calloc
-[eva] calloc.c:23: allocating variable __calloc_main_l23
+[eva:malloc:new] calloc.c:23: allocating variable __calloc_main_l23
 [eva] calloc.c:26: assertion got status valid.
 [eva] calloc.c:27: assertion got status valid.
 [eva] calloc.c:30: Call to builtin calloc
-[eva] calloc.c:30: allocating variable __calloc_main_l30
+[eva:malloc:new] calloc.c:30: allocating variable __calloc_main_l30
 [eva] calloc.c:33: assertion got status valid.
 [eva] calloc.c:34: assertion got status valid.
 [eva] calloc.c:35: assertion got status valid.
diff --git a/tests/builtins/oracle/calloc.2.res.oracle b/tests/builtins/oracle/calloc.2.res.oracle
index dd49f843488cfe7ea2005f439f15496342dc0d3a..aeadce0c13d2f98c6590bbe56f45969b6ae4c291 100644
--- a/tests/builtins/oracle/calloc.2.res.oracle
+++ b/tests/builtins/oracle/calloc.2.res.oracle
@@ -5,17 +5,17 @@
 [eva:initial-state] Values of globals at initialization
   nondet ∈ [--..--]
 [eva] calloc.c:14: Call to builtin calloc
-[eva] calloc.c:14: allocating variable __calloc_main_l14
+[eva:malloc:new] calloc.c:14: allocating variable __calloc_main_l14
 [eva] calloc.c:17: Call to builtin calloc
-[eva] calloc.c:17: allocating variable __calloc_main_l17
+[eva:malloc:new] calloc.c:17: allocating variable __calloc_main_l17
 [eva] calloc.c:20: Call to builtin calloc
-[eva] calloc.c:20: allocating variable __calloc_main_l20
+[eva:malloc:new] calloc.c:20: allocating variable __calloc_main_l20
 [eva] calloc.c:23: Call to builtin calloc
-[eva] calloc.c:23: allocating variable __calloc_main_l23
+[eva:malloc:new] calloc.c:23: allocating variable __calloc_main_l23
 [eva] calloc.c:26: assertion got status valid.
 [eva] calloc.c:27: assertion got status valid.
 [eva] calloc.c:30: Call to builtin calloc
-[eva] calloc.c:30: allocating variable __calloc_main_l30
+[eva:malloc:new] calloc.c:30: allocating variable __calloc_main_l30
 [eva] calloc.c:33: assertion got status valid.
 [eva] calloc.c:34: assertion got status valid.
 [eva] calloc.c:35: assertion got status valid.
diff --git a/tests/builtins/oracle/calloc.3.res.oracle b/tests/builtins/oracle/calloc.3.res.oracle
index dd49f843488cfe7ea2005f439f15496342dc0d3a..aeadce0c13d2f98c6590bbe56f45969b6ae4c291 100644
--- a/tests/builtins/oracle/calloc.3.res.oracle
+++ b/tests/builtins/oracle/calloc.3.res.oracle
@@ -5,17 +5,17 @@
 [eva:initial-state] Values of globals at initialization
   nondet ∈ [--..--]
 [eva] calloc.c:14: Call to builtin calloc
-[eva] calloc.c:14: allocating variable __calloc_main_l14
+[eva:malloc:new] calloc.c:14: allocating variable __calloc_main_l14
 [eva] calloc.c:17: Call to builtin calloc
-[eva] calloc.c:17: allocating variable __calloc_main_l17
+[eva:malloc:new] calloc.c:17: allocating variable __calloc_main_l17
 [eva] calloc.c:20: Call to builtin calloc
-[eva] calloc.c:20: allocating variable __calloc_main_l20
+[eva:malloc:new] calloc.c:20: allocating variable __calloc_main_l20
 [eva] calloc.c:23: Call to builtin calloc
-[eva] calloc.c:23: allocating variable __calloc_main_l23
+[eva:malloc:new] calloc.c:23: allocating variable __calloc_main_l23
 [eva] calloc.c:26: assertion got status valid.
 [eva] calloc.c:27: assertion got status valid.
 [eva] calloc.c:30: Call to builtin calloc
-[eva] calloc.c:30: allocating variable __calloc_main_l30
+[eva:malloc:new] calloc.c:30: allocating variable __calloc_main_l30
 [eva] calloc.c:33: assertion got status valid.
 [eva] calloc.c:34: assertion got status valid.
 [eva] calloc.c:35: assertion got status valid.
diff --git a/tests/builtins/oracle/calloc.4.res.oracle b/tests/builtins/oracle/calloc.4.res.oracle
index dd49f843488cfe7ea2005f439f15496342dc0d3a..aeadce0c13d2f98c6590bbe56f45969b6ae4c291 100644
--- a/tests/builtins/oracle/calloc.4.res.oracle
+++ b/tests/builtins/oracle/calloc.4.res.oracle
@@ -5,17 +5,17 @@
 [eva:initial-state] Values of globals at initialization
   nondet ∈ [--..--]
 [eva] calloc.c:14: Call to builtin calloc
-[eva] calloc.c:14: allocating variable __calloc_main_l14
+[eva:malloc:new] calloc.c:14: allocating variable __calloc_main_l14
 [eva] calloc.c:17: Call to builtin calloc
-[eva] calloc.c:17: allocating variable __calloc_main_l17
+[eva:malloc:new] calloc.c:17: allocating variable __calloc_main_l17
 [eva] calloc.c:20: Call to builtin calloc
-[eva] calloc.c:20: allocating variable __calloc_main_l20
+[eva:malloc:new] calloc.c:20: allocating variable __calloc_main_l20
 [eva] calloc.c:23: Call to builtin calloc
-[eva] calloc.c:23: allocating variable __calloc_main_l23
+[eva:malloc:new] calloc.c:23: allocating variable __calloc_main_l23
 [eva] calloc.c:26: assertion got status valid.
 [eva] calloc.c:27: assertion got status valid.
 [eva] calloc.c:30: Call to builtin calloc
-[eva] calloc.c:30: allocating variable __calloc_main_l30
+[eva:malloc:new] calloc.c:30: allocating variable __calloc_main_l30
 [eva] calloc.c:33: assertion got status valid.
 [eva] calloc.c:34: assertion got status valid.
 [eva] calloc.c:35: assertion got status valid.
diff --git a/tests/builtins/oracle/free.res.oracle b/tests/builtins/oracle/free.res.oracle
index 402a7224a2cca94a7b1da281ab5d0982e65fd689..7e8b3e36c70b2073e03a9e58ad9b3831afac3fe0 100644
--- a/tests/builtins/oracle/free.res.oracle
+++ b/tests/builtins/oracle/free.res.oracle
@@ -7,9 +7,9 @@
 [eva] computing for function main1 <- main.
   Called from free.c:44.
 [eva] free.c:8: Call to builtin malloc
-[eva] free.c:8: allocating variable __malloc_main1_l8
+[eva:malloc:new] free.c:8: allocating variable __malloc_main1_l8
 [eva] free.c:10: Call to builtin malloc
-[eva] free.c:10: allocating variable __malloc_main1_l10
+[eva:malloc:new] free.c:10: allocating variable __malloc_main1_l10
 [eva] free.c:13: 
   Frama_C_dump_each:
   # cvalue:
@@ -49,7 +49,7 @@
 [eva:malloc] free.c:14: 
   weak free on bases: {__malloc_main1_l8, __malloc_main1_l10}
 [eva] free.c:16: Call to builtin malloc
-[eva] free.c:16: allocating variable __malloc_main1_l16
+[eva:malloc:new] free.c:16: allocating variable __malloc_main1_l16
 [eva] free.c:18: Call to builtin free
 [eva] free.c:18: function free: precondition 'freeable' got status valid.
 [eva:malloc] free.c:18: strong free on bases: {__malloc_main1_l16}
@@ -57,7 +57,7 @@
 [eva] free.c:21: function free: precondition 'freeable' got status valid.
 [eva:malloc] free.c:21: strong free on bases: {}
 [eva] free.c:23: Call to builtin malloc
-[eva] free.c:23: allocating variable __malloc_main1_l23
+[eva:malloc:new] free.c:23: allocating variable __malloc_main1_l23
 [eva] free.c:26: Call to builtin free
 [eva] free.c:26: function free: precondition 'freeable' got status valid.
 [eva:malloc] free.c:26: weak free on bases: {__malloc_main1_l23}
@@ -66,7 +66,7 @@
 [eva] computing for function main2 <- main.
   Called from free.c:45.
 [eva] free.c:35: Call to builtin malloc
-[eva] free.c:35: allocating variable __malloc_main2_l35
+[eva:malloc:new] free.c:35: allocating variable __malloc_main2_l35
 [eva] free.c:39: Call to builtin free
 [eva] free.c:39: function free: precondition 'freeable' got status valid.
 [eva:malloc] free.c:39: strong free on bases: {__malloc_main2_l35}
diff --git a/tests/builtins/oracle/from_result.res.oracle b/tests/builtins/oracle/from_result.res.oracle
index 5d1543b18fd21b9d1a241c1c3fd0ec1391587ef5..947ea0bed392daa6a55090a0d52fff7c3b265995 100644
--- a/tests/builtins/oracle/from_result.res.oracle
+++ b/tests/builtins/oracle/from_result.res.oracle
@@ -7,13 +7,13 @@
 [eva] computing for function bar <- main.
   Called from from_result.c:32.
 [eva] from_result.c:18: Call to builtin malloc
-[eva] from_result.c:18: allocating variable __malloc_bar_l18
+[eva:malloc:new] from_result.c:18: allocating variable __malloc_bar_l18
 [eva] Recording results for bar
 [eva] Done for function bar
 [eva] computing for function bar <- main.
   Called from from_result.c:33.
 [eva] from_result.c:18: Call to builtin malloc
-[eva] from_result.c:18: allocating variable __malloc_bar_l18_0
+[eva:malloc:new] from_result.c:18: allocating variable __malloc_bar_l18_0
 [eva] Recording results for bar
 [eva] Done for function bar
 [eva] computing for function create_t <- main.
diff --git a/tests/builtins/oracle/gcc_zero_length_array.res.oracle b/tests/builtins/oracle/gcc_zero_length_array.res.oracle
index e206f5dec123bc62189982d0614d20699cd9d3e1..2de3773f803ca4cdad4f123341f3a55b661a7724 100644
--- a/tests/builtins/oracle/gcc_zero_length_array.res.oracle
+++ b/tests/builtins/oracle/gcc_zero_length_array.res.oracle
@@ -7,7 +7,8 @@
 [eva] computing for function make_fam <- main.
   Called from gcc_zero_length_array.c:24.
 [eva] gcc_zero_length_array.c:15: Call to builtin malloc
-[eva] gcc_zero_length_array.c:15: allocating variable __malloc_make_fam_l15
+[eva:malloc:new] gcc_zero_length_array.c:15: 
+  allocating variable __malloc_make_fam_l15
 [eva] Recording results for make_fam
 [eva] Done for function make_fam
 [eva] gcc_zero_length_array.c:26: Call to builtin free
diff --git a/tests/builtins/oracle/imprecise-malloc-free.res.oracle b/tests/builtins/oracle/imprecise-malloc-free.res.oracle
index 12f3b1ea66b34ad3c965c436a9268a36cba10676..559cff3d4d49be5d23bcf20219a82bded1e02118 100644
--- a/tests/builtins/oracle/imprecise-malloc-free.res.oracle
+++ b/tests/builtins/oracle/imprecise-malloc-free.res.oracle
@@ -21,11 +21,14 @@
   Assigning imprecise value to size
   because of arithmetic operation on addresses.
 [eva] imprecise-malloc-free.c:14: Call to builtin malloc
-[eva] imprecise-malloc-free.c:14: allocating variable __malloc_main_l14
+[eva:malloc:new] imprecise-malloc-free.c:14: 
+  allocating variable __malloc_main_l14
 [eva] imprecise-malloc-free.c:15: Call to builtin malloc
-[eva] imprecise-malloc-free.c:15: allocating variable __malloc_main_l15
+[eva:malloc:new] imprecise-malloc-free.c:15: 
+  allocating variable __malloc_main_l15
 [eva] imprecise-malloc-free.c:16: Call to builtin malloc
-[eva] imprecise-malloc-free.c:16: allocating variable __malloc_main_l16
+[eva:malloc:new] imprecise-malloc-free.c:16: 
+  allocating variable __malloc_main_l16
 [eva] imprecise-malloc-free.c:18: 
   Frama_C_show_each:
   {{ &__malloc_main_l14 }}, {{ &__malloc_main_l15 }}, {{ &__malloc_main_l16 }}
diff --git a/tests/builtins/oracle/linked_list.0.res.oracle b/tests/builtins/oracle/linked_list.0.res.oracle
index 46862a2655e4a39732bfc305d8f565ee8716e9df..c1062456d5af1482f1faf0ac2473526e48b4c78b 100644
--- a/tests/builtins/oracle/linked_list.0.res.oracle
+++ b/tests/builtins/oracle/linked_list.0.res.oracle
@@ -85,7 +85,7 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] linked_list.c:39: starting to merge loop iterations
+[eva:partition] linked_list.c:39: starting to merge loop iterations
 [eva] linked_list.c:40: 
   Frama_C_dump_each:
   # cvalue:
@@ -2298,10 +2298,10 @@
   ==END OF DUMP==
 [eva] computing for function printf_va_1 <- main.
   Called from linked_list.c:51.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] linked_list.c:51: function printf_va_1: precondition got status valid.
 [eva] Done for function printf_va_1
-[eva] linked_list.c:50: starting to merge loop iterations
+[eva:partition] linked_list.c:50: starting to merge loop iterations
 [eva] computing for function printf_va_1 <- main.
   Called from linked_list.c:51.
 [eva] Done for function printf_va_1
diff --git a/tests/builtins/oracle/linked_list.1.res.oracle b/tests/builtins/oracle/linked_list.1.res.oracle
index 916c9e2bba809abbcd4abc13454d1183d6998a5a..bdbac128f379ed6b20012f38101b3c4ccddf141e 100644
--- a/tests/builtins/oracle/linked_list.1.res.oracle
+++ b/tests/builtins/oracle/linked_list.1.res.oracle
@@ -85,7 +85,7 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] linked_list.c:39: starting to merge loop iterations
+[eva:partition] linked_list.c:39: starting to merge loop iterations
 [eva] linked_list.c:40: 
   Frama_C_dump_each:
   # cvalue:
@@ -804,14 +804,14 @@
   ==END OF DUMP==
 [eva] computing for function printf_va_1 <- main.
   Called from linked_list.c:51.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] linked_list.c:51: function printf_va_1: precondition got status valid.
 [eva:garbled-mix:assigns] linked_list.c:51: 
   The specification of function printf_va_1
   has generated a garbled mix of addresses
   for assigns clause __fc_stdout->__fc_FILE_data.
 [eva] Done for function printf_va_1
-[eva] linked_list.c:50: starting to merge loop iterations
+[eva:partition] linked_list.c:50: starting to merge loop iterations
 [eva:alarm] linked_list.c:51: Warning: 
   out of bounds read. assert \valid_read(&curr->val);
 [eva] computing for function printf_va_1 <- main.
diff --git a/tests/builtins/oracle/linked_list.2.res.oracle b/tests/builtins/oracle/linked_list.2.res.oracle
index cb6c771649a7abe82835280f67ccf0516a2cd706..cc10e98d65308f40e0804fe6329e734316692d0b 100644
--- a/tests/builtins/oracle/linked_list.2.res.oracle
+++ b/tests/builtins/oracle/linked_list.2.res.oracle
@@ -967,7 +967,7 @@
   ==END OF DUMP==
 [eva] computing for function printf_va_1 <- main.
   Called from linked_list.c:51.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] linked_list.c:51: function printf_va_1: precondition got status valid.
 [eva] Done for function printf_va_1
 [eva] computing for function printf_va_1 <- main.
diff --git a/tests/builtins/oracle/malloc-deps.res.oracle b/tests/builtins/oracle/malloc-deps.res.oracle
index 78a74a85a12248f9eb0ca87efb51f6de11b31692..0abfe1e2a8590768691c7f8526f25ed87f1aec5b 100644
--- a/tests/builtins/oracle/malloc-deps.res.oracle
+++ b/tests/builtins/oracle/malloc-deps.res.oracle
@@ -5,11 +5,11 @@
 [eva:initial-state] Values of globals at initialization
   v ∈ [--..--]
 [eva] malloc-deps.c:12: Call to builtin malloc
-[eva] malloc-deps.c:12: allocating weak variable __malloc_w_main_l12
+[eva:malloc:new] malloc-deps.c:12: allocating weak variable __malloc_w_main_l12
 [eva] malloc-deps.c:17: Call to builtin malloc
-[eva] malloc-deps.c:17: allocating variable __malloc_main_l17
+[eva:malloc:new] malloc-deps.c:17: allocating variable __malloc_main_l17
 [eva] malloc-deps.c:25: Call to builtin malloc
-[eva] malloc-deps.c:25: allocating variable __malloc_main_l25
+[eva:malloc:new] malloc-deps.c:25: allocating variable __malloc_main_l25
 [eva] computing for function g <- main.
   Called from malloc-deps.c:26.
 [eva:alarm] malloc-deps.c:7: Warning: out of bounds write. assert \valid(p + k);
@@ -65,7 +65,7 @@
 [from] Computing for function g
 [from] Done for function g
 [eva] Done for function g
-[eva] malloc-deps.c:23: starting to merge loop iterations
+[eva:partition] malloc-deps.c:23: starting to merge loop iterations
 [eva] malloc-deps.c:25: Call to builtin malloc
 [eva:malloc] malloc-deps.c:25: 
   resizing variable `__malloc_w_main_l25' (0..31/191) to fit 0..191/223
diff --git a/tests/builtins/oracle/malloc-optimistic.res.oracle b/tests/builtins/oracle/malloc-optimistic.res.oracle
index 60e8831d4566fa768754eb7c19c6af5d676fbfd2..430d8fdd116a5d18219f3a39f0cfff8cfeb41a87 100644
--- a/tests/builtins/oracle/malloc-optimistic.res.oracle
+++ b/tests/builtins/oracle/malloc-optimistic.res.oracle
@@ -9,7 +9,7 @@
 [eva] malloc-optimistic.c:16: Frama_C_show_each_1_1: {0}
 [eva] malloc-optimistic.c:16: Frama_C_show_each_1_1: {1}
 [eva] malloc-optimistic.c:17: Call to builtin malloc
-[eva] malloc-optimistic.c:17: allocating variable __malloc_main1_l17
+[eva:malloc:new] malloc-optimistic.c:17: allocating variable __malloc_main1_l17
 [eva] malloc-optimistic.c:17: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:17: 
   resizing variable `__malloc_main1_l17' (0..31) to fit 0..63
@@ -26,7 +26,7 @@
 [eva] malloc-optimistic.c:26: Frama_C_show_each_2_1: {2}
 [eva] malloc-optimistic.c:26: Frama_C_show_each_2_1: {1}
 [eva] malloc-optimistic.c:27: Call to builtin malloc
-[eva] malloc-optimistic.c:27: allocating variable __malloc_main2_l27
+[eva:malloc:new] malloc-optimistic.c:27: allocating variable __malloc_main2_l27
 [eva] malloc-optimistic.c:27: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:27: 
   resizing variable `__malloc_main2_l27' (0..95) to fit 0..63
@@ -43,7 +43,8 @@
 [eva] computing for function main_3_aux <- main3 <- main.
   Called from malloc-optimistic.c:48.
 [eva] malloc-optimistic.c:34: Call to builtin malloc
-[eva] malloc-optimistic.c:34: allocating variable __malloc_main_3_aux_l34
+[eva:malloc:new] malloc-optimistic.c:34: 
+  allocating variable __malloc_main_3_aux_l34
 [eva] Recording results for main_3_aux
 [eva] Done for function main_3_aux
 [eva] computing for function main_3_aux <- main3 <- main.
@@ -65,7 +66,8 @@
 [eva] computing for function main_4_aux <- main4 <- main.
   Called from malloc-optimistic.c:56.
 [eva] malloc-optimistic.c:40: Call to builtin malloc
-[eva] malloc-optimistic.c:40: allocating variable __malloc_main_4_aux_l40
+[eva:malloc:new] malloc-optimistic.c:40: 
+  allocating variable __malloc_main_4_aux_l40
 [eva] Recording results for main_4_aux
 [eva] Done for function main_4_aux
 [eva] computing for function main_4_aux <- main4 <- main.
@@ -83,7 +85,7 @@
 [eva] computing for function main5 <- main.
   Called from malloc-optimistic.c:144.
 [eva] malloc-optimistic.c:64: Call to builtin malloc
-[eva] malloc-optimistic.c:64: allocating variable __malloc_main5_l64
+[eva:malloc:new] malloc-optimistic.c:64: allocating variable __malloc_main5_l64
 [eva] malloc-optimistic.c:64: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:64: 
   resizing variable `__malloc_main5_l64' (0..31) to fit 0..63
@@ -449,7 +451,7 @@
 [eva] computing for function main6 <- main.
   Called from malloc-optimistic.c:145.
 [eva] malloc-optimistic.c:77: Call to builtin malloc
-[eva] malloc-optimistic.c:77: allocating variable __malloc_main6_l77
+[eva:malloc:new] malloc-optimistic.c:77: allocating variable __malloc_main6_l77
 [eva] malloc-optimistic.c:77: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:77: 
   resizing variable `__malloc_main6_l77' (0..31) to fit 0..63
@@ -880,7 +882,7 @@
 [eva] computing for function main7 <- main.
   Called from malloc-optimistic.c:148.
 [eva] malloc-optimistic.c:90: Call to builtin malloc
-[eva] malloc-optimistic.c:90: allocating variable __malloc_main7_l90
+[eva:malloc:new] malloc-optimistic.c:90: allocating variable __malloc_main7_l90
 [eva] malloc-optimistic.c:90: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:90: 
   resizing variable `__malloc_main7_l90' (0..31) to fit 0..63
@@ -1782,7 +1784,7 @@
   ==END OF DUMP==
 [eva] malloc-optimistic.c:94: Call to builtin free
 [eva:malloc] malloc-optimistic.c:94: strong free on bases: {__malloc_main7_l90}
-[eva] malloc-optimistic.c:88: starting to merge loop iterations
+[eva:partition] malloc-optimistic.c:88: starting to merge loop iterations
 [eva] malloc-optimistic.c:90: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:90: 
   resizing variable `__malloc_main7_l90' (0..31/543) to fit 0..511/575
@@ -1875,7 +1877,8 @@
 [eva] computing for function main8 <- main.
   Called from malloc-optimistic.c:149.
 [eva] malloc-optimistic.c:103: Call to builtin malloc
-[eva] malloc-optimistic.c:103: allocating variable __malloc_main8_l103
+[eva:malloc:new] malloc-optimistic.c:103: 
+  allocating variable __malloc_main8_l103
 [eva] malloc-optimistic.c:103: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:103: 
   resizing variable `__malloc_main8_l103' (0..31) to fit 0..63
@@ -2976,7 +2979,7 @@
 [eva] malloc-optimistic.c:107: Call to builtin free
 [eva:malloc] malloc-optimistic.c:107: 
   weak free on bases: {__malloc_w_main8_l103}
-[eva] malloc-optimistic.c:101: starting to merge loop iterations
+[eva:partition] malloc-optimistic.c:101: starting to merge loop iterations
 [eva] malloc-optimistic.c:103: Call to builtin malloc
 [eva:malloc] malloc-optimistic.c:103: 
   resizing variable `__malloc_w_main8_l103' (0..31/543) to fit 0..511/575
@@ -3120,7 +3123,8 @@
 [eva] computing for function main9 <- main.
   Called from malloc-optimistic.c:150.
 [eva] malloc-optimistic.c:119: Call to builtin malloc
-[eva] malloc-optimistic.c:119: allocating variable __malloc_main9_l119
+[eva:malloc:new] malloc-optimistic.c:119: 
+  allocating variable __malloc_main9_l119
 [eva] malloc-optimistic.c:120: 
   Frama_C_show_each: {0}, {{ &__malloc_main9_l119 }}
 [eva] malloc-optimistic.c:122: Frama_C_show_each: {0}
@@ -3370,7 +3374,7 @@
   Called from malloc-optimistic.c:123.
 [eva] Recording results for main9_aux
 [eva] Done for function main9_aux
-[eva] malloc-optimistic.c:118: starting to merge loop iterations
+[eva:partition] malloc-optimistic.c:118: starting to merge loop iterations
 [eva] malloc-optimistic.c:119: Call to builtin malloc
 [eva] malloc-optimistic.c:120: 
   Frama_C_show_each: {30; 31}, {{ &__malloc_w_main9_l119 }}
diff --git a/tests/builtins/oracle/malloc-size-zero.0.res.oracle b/tests/builtins/oracle/malloc-size-zero.0.res.oracle
index 67dbcf45f09b96416fcb92788044bd5ca8978fa7..6f3ecd978f65e3cd1f99c184d0c03515d4c43eec 100644
--- a/tests/builtins/oracle/malloc-size-zero.0.res.oracle
+++ b/tests/builtins/oracle/malloc-size-zero.0.res.oracle
@@ -7,7 +7,8 @@
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:16.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
-[eva] malloc-size-zero.c:10: allocating variable __malloc_my_calloc_l10
+[eva:malloc:new] malloc-size-zero.c:10: 
+  allocating variable __malloc_my_calloc_l10
 [eva] Recording results for my_calloc
 [eva] Done for function my_calloc
 [eva] malloc-size-zero.c:20: Frama_C_show_each_not_NULL_p1:
@@ -16,26 +17,30 @@
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:29.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
-[eva] malloc-size-zero.c:10: allocating variable __malloc_my_calloc_l10_0
+[eva:malloc:new] malloc-size-zero.c:10: 
+  allocating variable __malloc_my_calloc_l10_0
 [eva] Recording results for my_calloc
 [eva] Done for function my_calloc
-[eva] malloc-size-zero.c:27: starting to merge loop iterations
+[eva:partition] malloc-size-zero.c:27: starting to merge loop iterations
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:29.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
-[eva] malloc-size-zero.c:10: allocating variable __malloc_my_calloc_l10_1
+[eva:malloc:new] malloc-size-zero.c:10: 
+  allocating variable __malloc_my_calloc_l10_1
 [eva] Recording results for my_calloc
 [eva] Done for function my_calloc
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:29.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
-[eva] malloc-size-zero.c:10: allocating variable __malloc_my_calloc_l10_2
+[eva:malloc:new] malloc-size-zero.c:10: 
+  allocating variable __malloc_my_calloc_l10_2
 [eva] Recording results for my_calloc
 [eva] Done for function my_calloc
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:29.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
-[eva] malloc-size-zero.c:10: allocating variable __malloc_my_calloc_l10_3
+[eva:malloc:new] malloc-size-zero.c:10: 
+  allocating variable __malloc_my_calloc_l10_3
 [eva] Recording results for my_calloc
 [eva] Done for function my_calloc
 [eva] computing for function my_calloc <- main.
diff --git a/tests/builtins/oracle/malloc-size-zero.1.res.oracle b/tests/builtins/oracle/malloc-size-zero.1.res.oracle
index 6cbcd7bba07f97bd5fadb3261a8df8e873665b58..d7e3d15a79da4cad6cdcc7a33b6500702518f2f3 100644
--- a/tests/builtins/oracle/malloc-size-zero.1.res.oracle
+++ b/tests/builtins/oracle/malloc-size-zero.1.res.oracle
@@ -7,7 +7,7 @@
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:16.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
-[eva] malloc-size-zero.c:10: allocating variable __malloc_main_l16
+[eva:malloc:new] malloc-size-zero.c:10: allocating variable __malloc_main_l16
 [eva] Recording results for my_calloc
 [eva] Done for function my_calloc
 [eva] malloc-size-zero.c:20: Frama_C_show_each_not_NULL_p1:
@@ -16,10 +16,10 @@
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:29.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
-[eva] malloc-size-zero.c:10: allocating variable __malloc_main_l29
+[eva:malloc:new] malloc-size-zero.c:10: allocating variable __malloc_main_l29
 [eva] Recording results for my_calloc
 [eva] Done for function my_calloc
-[eva] malloc-size-zero.c:27: starting to merge loop iterations
+[eva:partition] malloc-size-zero.c:27: starting to merge loop iterations
 [eva] computing for function my_calloc <- main.
   Called from malloc-size-zero.c:29.
 [eva] malloc-size-zero.c:10: Call to builtin malloc
diff --git a/tests/builtins/oracle/malloc.res.oracle b/tests/builtins/oracle/malloc.res.oracle
index 5f863f78b8dc5802faa83295ce87fb7eb49a2987..976bc7dc0fd45497b5d73b9a6e9a44f8e5b37937 100644
--- a/tests/builtins/oracle/malloc.res.oracle
+++ b/tests/builtins/oracle/malloc.res.oracle
@@ -5,19 +5,19 @@
 [eva:initial-state] Values of globals at initialization
   
 [eva] malloc.c:11: Call to builtin malloc
-[eva] malloc.c:11: allocating variable __malloc_main_l11
+[eva:malloc:new] malloc.c:11: allocating variable __malloc_main_l11
 [eva] malloc.c:17: Call to builtin malloc
-[eva] malloc.c:17: allocating variable __malloc_main_l17
+[eva:malloc:new] malloc.c:17: allocating variable __malloc_main_l17
 [eva] malloc.c:17: Call to builtin malloc
 [eva:malloc] malloc.c:17: 
   resizing variable `__malloc_main_l17' (0..-1/34359738359) to fit 0..-1
 [eva] malloc.c:18: Call to builtin malloc
-[eva] malloc.c:18: allocating variable __malloc_main_l18
+[eva:malloc:new] malloc.c:18: allocating variable __malloc_main_l18
 [eva] malloc.c:18: Call to builtin malloc
 [eva] malloc.c:20: Call to builtin malloc
-[eva] malloc.c:20: allocating variable __malloc_main_l20
+[eva:malloc:new] malloc.c:20: allocating variable __malloc_main_l20
 [eva] malloc.c:20: Call to builtin malloc
-[eva] malloc.c:20: allocating variable __malloc_main_l20_0
+[eva:malloc:new] malloc.c:20: allocating variable __malloc_main_l20_0
 [eva:alarm] malloc.c:21: Warning: out of bounds write. assert \valid(p);
 [eva:alarm] malloc.c:22: Warning: out of bounds write. assert \valid(p + 2);
 [eva:alarm] malloc.c:23: Warning: out of bounds write. assert \valid(p + 24999);
diff --git a/tests/builtins/oracle/malloc_bug_tr.res.oracle b/tests/builtins/oracle/malloc_bug_tr.res.oracle
index d2efa19735065d45a3aafb7b078699599ee77a6c..27d7e5af31d7373661a5ab01e431c378ba5a99c0 100644
--- a/tests/builtins/oracle/malloc_bug_tr.res.oracle
+++ b/tests/builtins/oracle/malloc_bug_tr.res.oracle
@@ -11,7 +11,7 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] malloc_bug_tr.c:12: Call to builtin malloc
-[eva] malloc_bug_tr.c:12: allocating variable __malloc_main_l12
+[eva:malloc:new] malloc_bug_tr.c:12: allocating variable __malloc_main_l12
 [eva] malloc_bug_tr.c:13: Call to builtin memcpy
 [eva] malloc_bug_tr.c:13: 
   function memcpy: precondition 'valid_dest' got status valid.
diff --git a/tests/builtins/oracle/malloc_individual.res.oracle b/tests/builtins/oracle/malloc_individual.res.oracle
index a7782384600eed6b490981477d99f2c892b16b46..24aaaa3319ba3c9b6e585096b5371db0529a9b7a 100644
--- a/tests/builtins/oracle/malloc_individual.res.oracle
+++ b/tests/builtins/oracle/malloc_individual.res.oracle
@@ -8,7 +8,7 @@
   B ∈ {0}
   C ∈ {0}
 [eva] malloc_individual.c:12: Call to builtin malloc
-[eva] malloc_individual.c:12: allocating variable __malloc_main_l12
+[eva:malloc:new] malloc_individual.c:12: allocating variable __malloc_main_l12
 [eva:alarm] malloc_individual.c:15: Warning: 
   accessing uninitialized left-value. assert \initialized(p);
 [eva] Recording results for main
diff --git a/tests/builtins/oracle/malloc_memexec.res.oracle b/tests/builtins/oracle/malloc_memexec.res.oracle
index 1791b356140dc5ba825f8ce76e6d32cad5596f9b..07be019cae2cceb2eba0e8fac91e9ab36c730d0c 100644
--- a/tests/builtins/oracle/malloc_memexec.res.oracle
+++ b/tests/builtins/oracle/malloc_memexec.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   v ∈ [--..--]
 [eva] malloc_memexec.c:14: Call to builtin malloc
-[eva] malloc_memexec.c:14: allocating variable __malloc_main_l14
+[eva:malloc:new] malloc_memexec.c:14: allocating variable __malloc_main_l14
 [eva] computing for function f <- main.
   Called from malloc_memexec.c:16.
 [eva] Recording results for f
@@ -19,7 +19,8 @@
 [eva] Recording results for f
 [eva] Done for function f
 [eva] malloc_memexec.c:23: Call to builtin malloc
-[eva] malloc_memexec.c:23: allocating weak variable __malloc_w_main_l23
+[eva:malloc:new] malloc_memexec.c:23: 
+  allocating weak variable __malloc_w_main_l23
 [eva] computing for function f <- main.
   Called from malloc_memexec.c:25.
 [eva] Recording results for f
diff --git a/tests/builtins/oracle/malloc_multiple.res.oracle b/tests/builtins/oracle/malloc_multiple.res.oracle
index eee3cf752050fb29f3cb7f5e054d8059da755927..d63a2ebb4c381cfb5a2a16460c9a2073b3cd89a3 100644
--- a/tests/builtins/oracle/malloc_multiple.res.oracle
+++ b/tests/builtins/oracle/malloc_multiple.res.oracle
@@ -8,19 +8,26 @@
 [eva] computing for function allocate_T <- main.
   Called from malloc_multiple.c:42.
 [eva] malloc_multiple.c:11: Call to builtin malloc
-[eva] malloc_multiple.c:11: allocating variable __malloc_allocate_T_l11
+[eva:malloc:new] malloc_multiple.c:11: 
+  allocating variable __malloc_allocate_T_l11
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_0
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_0
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_1
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_1
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_2
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_2
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_3
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_3
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_4
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_4
 [eva] malloc_multiple.c:14: Call to builtin malloc
 [eva:malloc:weak] malloc_multiple.c:14: 
   marking variable `__malloc_allocate_T_l14_4' as weak
@@ -31,19 +38,26 @@
 [eva] computing for function allocate_T <- main.
   Called from malloc_multiple.c:43.
 [eva] malloc_multiple.c:11: Call to builtin malloc
-[eva] malloc_multiple.c:11: allocating variable __malloc_allocate_T_l11_0
+[eva:malloc:new] malloc_multiple.c:11: 
+  allocating variable __malloc_allocate_T_l11_0
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_5
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_5
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_6
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_6
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_7
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_7
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_8
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_8
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_9
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_9
 [eva] malloc_multiple.c:14: Call to builtin malloc
-[eva] malloc_multiple.c:14: allocating variable __malloc_allocate_T_l14_10
+[eva:malloc:new] malloc_multiple.c:14: 
+  allocating variable __malloc_allocate_T_l14_10
 [eva] malloc_multiple.c:14: Call to builtin malloc
 [eva:malloc:weak] malloc_multiple.c:14: 
   marking variable `__malloc_allocate_T_l14_10' as weak
@@ -54,32 +68,32 @@
 [eva] computing for function allocate_and_free_last <- main.
   Called from malloc_multiple.c:44.
 [eva] malloc_multiple.c:29: Call to builtin malloc
-[eva] malloc_multiple.c:29: 
+[eva:malloc:new] malloc_multiple.c:29: 
   allocating variable __malloc_allocate_and_free_last_l29
 [eva] malloc_multiple.c:31: 
   Frama_C_show_each_F: {{ &__malloc_allocate_and_free_last_l29 }}
 [eva] malloc_multiple.c:29: Call to builtin malloc
-[eva] malloc_multiple.c:29: 
+[eva:malloc:new] malloc_multiple.c:29: 
   allocating variable __malloc_allocate_and_free_last_l29_0
 [eva] malloc_multiple.c:31: 
   Frama_C_show_each_F: {{ &__malloc_allocate_and_free_last_l29_0 }}
 [eva] malloc_multiple.c:29: Call to builtin malloc
-[eva] malloc_multiple.c:29: 
+[eva:malloc:new] malloc_multiple.c:29: 
   allocating variable __malloc_allocate_and_free_last_l29_1
 [eva] malloc_multiple.c:31: 
   Frama_C_show_each_F: {{ &__malloc_allocate_and_free_last_l29_1 }}
 [eva] malloc_multiple.c:29: Call to builtin malloc
-[eva] malloc_multiple.c:29: 
+[eva:malloc:new] malloc_multiple.c:29: 
   allocating variable __malloc_allocate_and_free_last_l29_2
 [eva] malloc_multiple.c:31: 
   Frama_C_show_each_F: {{ &__malloc_allocate_and_free_last_l29_2 }}
 [eva] malloc_multiple.c:29: Call to builtin malloc
-[eva] malloc_multiple.c:29: 
+[eva:malloc:new] malloc_multiple.c:29: 
   allocating variable __malloc_allocate_and_free_last_l29_3
 [eva] malloc_multiple.c:31: 
   Frama_C_show_each_F: {{ &__malloc_allocate_and_free_last_l29_3 }}
 [eva] malloc_multiple.c:29: Call to builtin malloc
-[eva] malloc_multiple.c:29: 
+[eva:malloc:new] malloc_multiple.c:29: 
   allocating variable __malloc_allocate_and_free_last_l29_4
 [eva] malloc_multiple.c:31: 
   Frama_C_show_each_F: {{ &__malloc_allocate_and_free_last_l29_4 }}
diff --git a/tests/builtins/oracle/memchr.res.oracle b/tests/builtins/oracle/memchr.res.oracle
index 95a734ff9931c3b820ce78b7048a447e590c5a2c..80471edbbf98946ca8a66c3d6b423d624a4e63ec 100644
--- a/tests/builtins/oracle/memchr.res.oracle
+++ b/tests/builtins/oracle/memchr.res.oracle
@@ -407,7 +407,7 @@
   pointer subtraction. assert \base_addr(_ss_1) ≡ \base_addr(s1);
 [eva] memchr.c:341: Frama_C_show_each_mymemchr: {3; 4}
 [eva] memchr.c:342: assertion got status valid.
-[eva] memchr.c:340: starting to merge loop iterations
+[eva:partition] memchr.c:340: starting to merge loop iterations
 [eva] memchr.c:341: Call to builtin memchr
 [eva] memchr.c:341: Frama_C_show_each_mymemchr: {3; 4}
 [eva] memchr.c:341: Call to builtin memchr
diff --git a/tests/builtins/oracle/memcpy.0.res.oracle b/tests/builtins/oracle/memcpy.0.res.oracle
index 8e98d1f82e589654f7ad90dadddd1f72e487cae7..020250bbca93d87250c147d992ebf88a55cc69cd 100644
--- a/tests/builtins/oracle/memcpy.0.res.oracle
+++ b/tests/builtins/oracle/memcpy.0.res.oracle
@@ -64,7 +64,7 @@
 [eva] Done for function many
 [eva] computing for function init <- test <- main.
   Called from memcpy.c:69.
-[eva] memcpy.c:24: Trace partitioning superposing up to 100 states
+[eva:partition] memcpy.c:24: Trace partitioning superposing up to 100 states
 [eva] Recording results for init
 [from] Computing for function init
 [from] Done for function init
@@ -143,7 +143,7 @@
   function memcpy: precondition 'separation' got status unknown.
 [eva:imprecision] memcpy.c:100: 
   In memcpy builtin: too many sizes to enumerate, possible loss of precision
-[eva] memcpy.c:99: starting to merge loop iterations
+[eva:partition] memcpy.c:99: starting to merge loop iterations
 [eva] memcpy.c:100: Call to builtin memcpy
 [eva] memcpy.c:105: Call to builtin memcpy
 [eva] memcpy.c:105: function memcpy: precondition 'valid_dest' got status valid.
@@ -156,7 +156,7 @@
 [eva] memcpy.c:109: function memcpy: precondition 'separation' got status valid.
 [eva:imprecision] memcpy.c:109: 
   In memcpy builtin: too many sizes to enumerate, possible loss of precision
-[eva] memcpy.c:114: starting to merge loop iterations
+[eva:partition] memcpy.c:114: starting to merge loop iterations
 [eva] memcpy.c:118: Call to builtin memcpy
 [eva:alarm] memcpy.c:118: Warning: 
   function memcpy: precondition 'valid_dest' got status unknown.
@@ -164,7 +164,7 @@
 [eva] memcpy.c:118: function memcpy: precondition 'separation' got status valid.
 [kernel:approximation] memcpy.c:118: 
   too many locations to update in array. Approximating.
-[eva] memcpy.c:122: starting to merge loop iterations
+[eva:partition] memcpy.c:122: starting to merge loop iterations
 [eva] memcpy.c:126: Call to builtin memcpy
 [eva:alarm] memcpy.c:126: Warning: 
   function memcpy: precondition 'valid_dest' got status unknown.
@@ -172,7 +172,7 @@
 [eva] memcpy.c:126: function memcpy: precondition 'separation' got status valid.
 [kernel:approximation] memcpy.c:126: 
   too many locations to update in array. Approximating.
-[eva] memcpy.c:130: starting to merge loop iterations
+[eva:partition] memcpy.c:130: starting to merge loop iterations
 [eva] memcpy.c:135: Call to builtin memcpy
 [eva:alarm] memcpy.c:135: Warning: 
   function memcpy: precondition 'valid_dest' got status unknown.
@@ -180,7 +180,7 @@
 [eva] memcpy.c:135: function memcpy: precondition 'separation' got status valid.
 [kernel:approximation] memcpy.c:135: 
   too many locations to update in array. Approximating.
-[eva] memcpy.c:139: starting to merge loop iterations
+[eva:partition] memcpy.c:139: starting to merge loop iterations
 [eva] memcpy.c:144: Call to builtin memcpy
 [eva:alarm] memcpy.c:144: Warning: 
   function memcpy: precondition 'valid_dest' got status unknown.
diff --git a/tests/builtins/oracle/memexec-malloc.res.oracle b/tests/builtins/oracle/memexec-malloc.res.oracle
index 72ede79e78ef907455dd5b8abcc05001f30c8a56..07bc41c19a76dba1074f0969f436e832311d3610 100644
--- a/tests/builtins/oracle/memexec-malloc.res.oracle
+++ b/tests/builtins/oracle/memexec-malloc.res.oracle
@@ -6,7 +6,7 @@
   t[0..1999] ∈ {0}
 [eva] computing for function f <- main.
   Called from memexec-malloc.c:23.
-[eva] memexec-malloc.c:10: starting to merge loop iterations
+[eva:partition] memexec-malloc.c:10: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
 [eva] computing for function f <- main.
@@ -21,13 +21,13 @@
 [eva] computing for function alloc <- main.
   Called from memexec-malloc.c:31.
 [eva] memexec-malloc.c:15: Call to builtin malloc
-[eva] memexec-malloc.c:15: allocating variable __malloc_main_l31
+[eva:malloc:new] memexec-malloc.c:15: allocating variable __malloc_main_l31
 [eva] Recording results for alloc
 [eva] Done for function alloc
 [eva] computing for function alloc <- main.
   Called from memexec-malloc.c:32.
 [eva] memexec-malloc.c:15: Call to builtin malloc
-[eva] memexec-malloc.c:15: allocating variable __malloc_main_l32
+[eva:malloc:new] memexec-malloc.c:15: allocating variable __malloc_main_l32
 [eva] Recording results for alloc
 [eva] Done for function alloc
 [eva] computing for function k <- main.
@@ -35,7 +35,7 @@
 [eva] computing for function alloc <- k <- main.
   Called from memexec-malloc.c:19.
 [eva] memexec-malloc.c:15: Call to builtin malloc
-[eva] memexec-malloc.c:15: allocating variable __malloc_k_l19
+[eva:malloc:new] memexec-malloc.c:15: allocating variable __malloc_k_l19
 [eva] Recording results for alloc
 [eva] Done for function alloc
 [eva] Recording results for k
@@ -45,7 +45,7 @@
 [eva] computing for function alloc <- k <- main.
   Called from memexec-malloc.c:19.
 [eva] memexec-malloc.c:15: Call to builtin malloc
-[eva] memexec-malloc.c:15: allocating variable __malloc_k_l19_0
+[eva:malloc:new] memexec-malloc.c:15: allocating variable __malloc_k_l19_0
 [eva] Recording results for alloc
 [eva] Done for function alloc
 [eva] Recording results for k
diff --git a/tests/builtins/oracle/memset.res.oracle b/tests/builtins/oracle/memset.res.oracle
index 8d3fb8dfc877afdfb1cc3c25df2c36c4d8fb47e2..58ab28e9830cd96c2cae02f531828f5da37710e8 100644
--- a/tests/builtins/oracle/memset.res.oracle
+++ b/tests/builtins/oracle/memset.res.oracle
@@ -67,7 +67,7 @@
 [eva] memset.c:47: Call to builtin memset
 [eva:alarm] memset.c:47: Warning: 
   function memset: precondition 'valid_s' got status unknown.
-[eva] memset.c:50: starting to merge loop iterations
+[eva:partition] memset.c:50: starting to merge loop iterations
 [eva] memset.c:54: Call to builtin memset
 [eva:alarm] memset.c:54: Warning: 
   function memset: precondition 'valid_s' got status unknown.
@@ -121,7 +121,8 @@
 [eva] computing for function memset_weak_base <- main.
   Called from memset.c:115.
 [eva] memset.c:101: Call to builtin malloc
-[eva] memset.c:101: allocating weak variable __malloc_w_memset_weak_base_l101
+[eva:malloc:new] memset.c:101: 
+  allocating weak variable __malloc_w_memset_weak_base_l101
 [eva] memset.c:106: Call to builtin memset
 [eva] memset.c:106: function memset: precondition 'valid_s' got status valid.
 [eva:imprecision] memset.c:106: 
diff --git a/tests/builtins/oracle/memset_malloc_0.res.oracle b/tests/builtins/oracle/memset_malloc_0.res.oracle
index a9308e4c721db610e35593c4a7a6de1179d5481c..908321373e9202ec05c22a9d89175bfab508cfac 100644
--- a/tests/builtins/oracle/memset_malloc_0.res.oracle
+++ b/tests/builtins/oracle/memset_malloc_0.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   p ∈ {0}
 [eva] memset_malloc_0.c:17: Call to builtin malloc
-[eva] memset_malloc_0.c:17: allocating variable __malloc_main_l17
+[eva:malloc:new] memset_malloc_0.c:17: allocating variable __malloc_main_l17
 [eva] memset_malloc_0.c:18: Call to builtin memset
 [eva] memset_malloc_0.c:18: 
   function memset: precondition 'valid_s' got status valid.
diff --git a/tests/builtins/oracle/realloc.res.oracle b/tests/builtins/oracle/realloc.res.oracle
index cedab8abdd07ec2d95dbfa3c0e4a34dcdfc84c3f..69de55384169cffa4c1c438b0d506e185a054763 100644
--- a/tests/builtins/oracle/realloc.res.oracle
+++ b/tests/builtins/oracle/realloc.res.oracle
@@ -7,7 +7,7 @@
 [eva] computing for function main1 <- main.
   Called from realloc.c:177.
 [eva] realloc.c:12: Call to builtin malloc
-[eva] realloc.c:12: allocating variable __malloc_main1_l12
+[eva:malloc:new] realloc.c:12: allocating variable __malloc_main1_l12
 [eva] realloc.c:15: 
   Frama_C_dump_each:
   # cvalue:
@@ -36,7 +36,7 @@
 [eva] realloc.c:16: Call to builtin realloc
 [eva] realloc.c:16: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main1_l12}
-[eva] realloc.c:16: allocating variable __realloc_main1_l16
+[eva:malloc:new] realloc.c:16: allocating variable __realloc_main1_l16
 [eva:malloc] realloc.c:16: strong free on bases: {__malloc_main1_l12}
 [eva] realloc.c:17: 
   Frama_C_dump_each:
@@ -78,12 +78,12 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] realloc.c:23: Call to builtin malloc
-[eva] realloc.c:23: allocating variable __malloc_main2_l23
+[eva:malloc:new] realloc.c:23: allocating variable __malloc_main2_l23
 [eva:alarm] realloc.c:24: Warning: out of bounds write. assert \valid(r + i);
 [eva] realloc.c:26: Call to builtin realloc
 [eva] realloc.c:26: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main2_l23}
-[eva] realloc.c:26: allocating variable __realloc_main2_l26
+[eva:malloc:new] realloc.c:26: allocating variable __realloc_main2_l26
 [eva:malloc] realloc.c:26: strong free on bases: {__malloc_main2_l23}
 [eva] realloc.c:27: 
   Frama_C_dump_each:
@@ -120,9 +120,9 @@
 [eva] computing for function main3 <- main.
   Called from realloc.c:179.
 [eva] realloc.c:32: Call to builtin malloc
-[eva] realloc.c:32: allocating variable __malloc_main3_l32
+[eva:malloc:new] realloc.c:32: allocating variable __malloc_main3_l32
 [eva] realloc.c:35: Call to builtin malloc
-[eva] realloc.c:35: allocating variable __malloc_main3_l35
+[eva:malloc:new] realloc.c:35: allocating variable __malloc_main3_l35
 [eva] computing for function Frama_C_interval <- main3 <- main.
   Called from realloc.c:39.
 [eva] realloc.c:39: 
@@ -159,7 +159,7 @@
 [eva] realloc.c:46: Call to builtin realloc
 [eva] realloc.c:46: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main3_l32, __malloc_main3_l35}
-[eva] realloc.c:46: allocating variable __realloc_main3_l46
+[eva:malloc:new] realloc.c:46: allocating variable __realloc_main3_l46
 [eva:malloc] realloc.c:46: 
   weak free on bases: {__malloc_main3_l32, __malloc_main3_l35}
 [eva] realloc.c:48: 
@@ -223,9 +223,9 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] realloc.c:55: Call to builtin malloc
-[eva] realloc.c:55: allocating variable __malloc_main4_l55
+[eva:malloc:new] realloc.c:55: allocating variable __malloc_main4_l55
 [eva] realloc.c:56: Call to builtin malloc
-[eva] realloc.c:56: allocating variable __malloc_main4_l56
+[eva:malloc:new] realloc.c:56: allocating variable __malloc_main4_l56
 [eva:alarm] realloc.c:59: Warning: out of bounds write. assert \valid(q + i);
 [eva:alarm] realloc.c:58: Warning: out of bounds write. assert \valid(p + i);
 [eva] realloc.c:61: 
@@ -278,12 +278,12 @@
 [eva] realloc.c:67: Call to builtin realloc
 [eva] realloc.c:67: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main4_l55}
-[eva] realloc.c:67: allocating variable __realloc_main4_l67
+[eva:malloc:new] realloc.c:67: allocating variable __realloc_main4_l67
 [eva:malloc] realloc.c:67: strong free on bases: {__malloc_main4_l55}
 [eva] realloc.c:68: Call to builtin realloc
 [eva] realloc.c:68: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main4_l56}
-[eva] realloc.c:68: allocating variable __realloc_main4_l68
+[eva:malloc:new] realloc.c:68: allocating variable __realloc_main4_l68
 [eva:malloc] realloc.c:68: strong free on bases: {__malloc_main4_l56}
 [eva] realloc.c:69: 
   Frama_C_dump_each:
@@ -342,7 +342,7 @@
 [eva] computing for function main5 <- main.
   Called from realloc.c:181.
 [eva] realloc.c:76: Call to builtin malloc
-[eva] realloc.c:76: allocating variable __malloc_main5_l76
+[eva:malloc:new] realloc.c:76: allocating variable __malloc_main5_l76
 [eva] computing for function Frama_C_interval <- main5 <- main.
   Called from realloc.c:78.
 [eva] realloc.c:78: 
@@ -377,7 +377,7 @@
 [eva] realloc.c:85: Call to builtin realloc
 [eva] realloc.c:85: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main5_l76}
-[eva] realloc.c:85: allocating variable __realloc_main5_l85
+[eva:malloc:new] realloc.c:85: allocating variable __realloc_main5_l85
 [eva:malloc] realloc.c:85: weak free on bases: {__malloc_main5_l76}
 [eva] realloc.c:86: 
   Frama_C_dump_each:
@@ -426,7 +426,7 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] realloc.c:93: Call to builtin malloc
-[eva] realloc.c:93: allocating variable __malloc_main6_l93
+[eva:malloc:new] realloc.c:93: allocating variable __malloc_main6_l93
 [eva] realloc.c:102: Frama_C_show_each: {{ &x ; &__malloc_main6_l93 + {4} }}
 [eva] realloc.c:103: Call to builtin realloc
 [eva:alarm] realloc.c:103: Warning: 
@@ -439,11 +439,11 @@
 [eva] computing for function main7 <- main.
   Called from realloc.c:183.
 [eva] realloc.c:110: Call to builtin malloc
-[eva] realloc.c:110: allocating variable __malloc_main7_l110
+[eva:malloc:new] realloc.c:110: allocating variable __malloc_main7_l110
 [eva] realloc.c:115: Call to builtin realloc
 [eva] realloc.c:115: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main7_l110}
-[eva] realloc.c:115: allocating variable __realloc_main7_l115
+[eva:malloc:new] realloc.c:115: allocating variable __realloc_main7_l115
 [eva:malloc] realloc.c:115: strong free on bases: {__malloc_main7_l110}
 [eva] realloc.c:116: 
   Frama_C_dump_each:
@@ -506,11 +506,11 @@
 [eva] computing for function main8 <- main.
   Called from realloc.c:184.
 [eva] realloc.c:123: Call to builtin malloc
-[eva] realloc.c:123: allocating variable __malloc_main8_l123
+[eva:malloc:new] realloc.c:123: allocating variable __malloc_main8_l123
 [eva] realloc.c:126: Call to builtin realloc
 [eva] realloc.c:126: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main8_l123}
-[eva] realloc.c:126: allocating variable __realloc_main8_l126
+[eva:malloc:new] realloc.c:126: allocating variable __realloc_main8_l126
 [eva:malloc] realloc.c:126: strong free on bases: {__malloc_main8_l123}
 [eva] realloc.c:127: 
   Frama_C_dump_each:
@@ -544,11 +544,11 @@
 [eva] computing for function main9 <- main.
   Called from realloc.c:185.
 [eva] realloc.c:132: Call to builtin malloc
-[eva] realloc.c:132: allocating variable __malloc_main9_l132
+[eva:malloc:new] realloc.c:132: allocating variable __malloc_main9_l132
 [eva] realloc.c:135: Call to builtin realloc
 [eva] realloc.c:135: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main9_l132}
-[eva] realloc.c:135: allocating variable __realloc_main9_l135
+[eva:malloc:new] realloc.c:135: allocating variable __realloc_main9_l135
 [eva:malloc] realloc.c:135: strong free on bases: {__malloc_main9_l132}
 [eva] realloc.c:136: 
   Frama_C_dump_each:
@@ -582,11 +582,11 @@
 [eva] computing for function main10 <- main.
   Called from realloc.c:186.
 [eva] realloc.c:147: Call to builtin malloc
-[eva] realloc.c:147: allocating variable __malloc_main10_l147
+[eva:malloc:new] realloc.c:147: allocating variable __malloc_main10_l147
 [eva] realloc.c:152: Call to builtin realloc
 [eva] realloc.c:152: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main10_l147}
-[eva] realloc.c:152: allocating variable __realloc_main10_l152
+[eva:malloc:new] realloc.c:152: allocating variable __realloc_main10_l152
 [eva:malloc] realloc.c:152: strong free on bases: {__malloc_main10_l147}
 [eva] realloc.c:154: Frama_C_show_each_main10: {4}
 [eva] realloc.c:155: 
@@ -650,12 +650,12 @@
 [eva] computing for function main11 <- main.
   Called from realloc.c:187.
 [eva] realloc.c:160: Call to builtin malloc
-[eva] realloc.c:160: allocating variable __malloc_main11_l160
+[eva:malloc:new] realloc.c:160: allocating variable __malloc_main11_l160
 [eva] realloc.c:165: Call to builtin reallocarray
 [eva] realloc.c:165: 
   function reallocarray: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main11_l160}
-[eva] realloc.c:165: allocating variable __realloc_main11_l165
+[eva:malloc:new] realloc.c:165: allocating variable __realloc_main11_l165
 [eva:malloc] realloc.c:165: strong free on bases: {__malloc_main11_l160}
 [eva] realloc.c:167: Call to builtin reallocarray
 [eva] realloc.c:167: 
@@ -674,7 +674,7 @@
 [eva] realloc.c:171: Warning: 
   reallocarray out of bounds: assert(nmemb * size <= SIZE_MAX)
 [eva:malloc] bases_to_realloc: {}
-[eva] realloc.c:171: allocating variable __realloc_main11_l171
+[eva:malloc:new] realloc.c:171: allocating variable __realloc_main11_l171
 [eva:malloc] realloc.c:171: strong free on bases: {}
 [eva] realloc.c:172: Frama_C_show_each_p: {0}
 [eva] realloc.c:172: Frama_C_show_each_p: {{ &__realloc_main11_l171 }}
diff --git a/tests/builtins/oracle/realloc2.res.oracle b/tests/builtins/oracle/realloc2.res.oracle
index c5527602cfeb6b210a6691e88689f1e9a1082d98..64d738020e29731c5f68859c79da77dabdfb63c6 100644
--- a/tests/builtins/oracle/realloc2.res.oracle
+++ b/tests/builtins/oracle/realloc2.res.oracle
@@ -9,7 +9,8 @@
 [eva] realloc2.c:27: Call to builtin realloc
 [eva] realloc2.c:27: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {}
-[eva] realloc2.c:27: allocating variable __realloc_test_exact_null_l27
+[eva:malloc:new] realloc2.c:27: 
+  allocating variable __realloc_test_exact_null_l27
 [eva:malloc] realloc2.c:27: strong free on bases: {}
 [eva] computing for function fill <- test_exact_null <- main.
   Called from realloc2.c:28.
@@ -22,14 +23,16 @@
 [eva] realloc2.c:32: Call to builtin realloc
 [eva] realloc2.c:32: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {}
-[eva] realloc2.c:32: allocating variable __realloc_test_exact_null_free_l32
+[eva:malloc:new] realloc2.c:32: 
+  allocating variable __realloc_test_exact_null_free_l32
 [eva:malloc] realloc2.c:32: strong free on bases: {}
 [eva] Recording results for test_exact_null_free
 [eva] Done for function test_exact_null_free
 [eva] computing for function test_exact_nonnull_expand <- main.
   Called from realloc2.c:196.
 [eva] realloc2.c:36: Call to builtin malloc
-[eva] realloc2.c:36: allocating variable __malloc_test_exact_nonnull_expand_l36
+[eva:malloc:new] realloc2.c:36: 
+  allocating variable __malloc_test_exact_nonnull_expand_l36
 [eva] computing for function fill <- test_exact_nonnull_expand <- main.
   Called from realloc2.c:37.
 [eva] Recording results for fill
@@ -37,7 +40,8 @@
 [eva] realloc2.c:38: Call to builtin realloc
 [eva] realloc2.c:38: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_exact_nonnull_expand_l36}
-[eva] realloc2.c:38: allocating variable __realloc_test_exact_nonnull_expand_l38
+[eva:malloc:new] realloc2.c:38: 
+  allocating variable __realloc_test_exact_nonnull_expand_l38
 [eva:malloc] realloc2.c:38: 
   strong free on bases: {__malloc_test_exact_nonnull_expand_l36}
 [eva] computing for function fill <- test_exact_nonnull_expand <- main.
@@ -49,7 +53,8 @@
 [eva] computing for function test_exact_nonnull_shrink <- main.
   Called from realloc2.c:197.
 [eva] realloc2.c:44: Call to builtin malloc
-[eva] realloc2.c:44: allocating variable __malloc_test_exact_nonnull_shrink_l44
+[eva:malloc:new] realloc2.c:44: 
+  allocating variable __malloc_test_exact_nonnull_shrink_l44
 [eva] computing for function fill <- test_exact_nonnull_shrink <- main.
   Called from realloc2.c:45.
 [eva] Recording results for fill
@@ -57,7 +62,8 @@
 [eva] realloc2.c:46: Call to builtin realloc
 [eva] realloc2.c:46: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_exact_nonnull_shrink_l44}
-[eva] realloc2.c:46: allocating variable __realloc_test_exact_nonnull_shrink_l46
+[eva:malloc:new] realloc2.c:46: 
+  allocating variable __realloc_test_exact_nonnull_shrink_l46
 [eva:malloc] realloc2.c:46: 
   strong free on bases: {__malloc_test_exact_nonnull_shrink_l44}
 [eva] computing for function fill <- test_exact_nonnull_shrink <- main.
@@ -69,7 +75,8 @@
 [eva] computing for function test_exact_nonnull_free <- main.
   Called from realloc2.c:198.
 [eva] realloc2.c:51: Call to builtin malloc
-[eva] realloc2.c:51: allocating variable __malloc_test_exact_nonnull_free_l51
+[eva:malloc:new] realloc2.c:51: 
+  allocating variable __malloc_test_exact_nonnull_free_l51
 [eva] computing for function fill <- test_exact_nonnull_free <- main.
   Called from realloc2.c:52.
 [eva] Recording results for fill
@@ -77,7 +84,8 @@
 [eva] realloc2.c:53: Call to builtin realloc
 [eva] realloc2.c:53: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_exact_nonnull_free_l51}
-[eva] realloc2.c:53: allocating variable __realloc_test_exact_nonnull_free_l53
+[eva:malloc:new] realloc2.c:53: 
+  allocating variable __realloc_test_exact_nonnull_free_l53
 [eva:malloc] realloc2.c:53: 
   strong free on bases: {__malloc_test_exact_nonnull_free_l51}
 [eva] Recording results for test_exact_nonnull_free
@@ -85,11 +93,13 @@
 [eva] computing for function test_maybe_nonnull <- main.
   Called from realloc2.c:199.
 [eva] realloc2.c:57: Call to builtin malloc
-[eva] realloc2.c:57: allocating variable __malloc_test_maybe_nonnull_l57
+[eva:malloc:new] realloc2.c:57: 
+  allocating variable __malloc_test_maybe_nonnull_l57
 [eva] realloc2.c:58: Call to builtin realloc
 [eva] realloc2.c:58: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_maybe_nonnull_l57}
-[eva] realloc2.c:58: allocating variable __realloc_test_maybe_nonnull_l58
+[eva:malloc:new] realloc2.c:58: 
+  allocating variable __realloc_test_maybe_nonnull_l58
 [eva:malloc] realloc2.c:58: 
   weak free on bases: {__malloc_test_maybe_nonnull_l57}
 [eva] computing for function fill <- test_maybe_nonnull <- main.
@@ -101,7 +111,7 @@
 [eva] computing for function test_same_size <- main.
   Called from realloc2.c:200.
 [eva] realloc2.c:63: Call to builtin malloc
-[eva] realloc2.c:63: allocating variable __malloc_test_same_size_l63
+[eva:malloc:new] realloc2.c:63: allocating variable __malloc_test_same_size_l63
 [eva] computing for function fill <- test_same_size <- main.
   Called from realloc2.c:64.
 [eva] Recording results for fill
@@ -109,7 +119,7 @@
 [eva] realloc2.c:65: Call to builtin realloc
 [eva] realloc2.c:65: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_same_size_l63}
-[eva] realloc2.c:65: allocating variable __realloc_test_same_size_l65
+[eva:malloc:new] realloc2.c:65: allocating variable __realloc_test_same_size_l65
 [eva:malloc] realloc2.c:65: strong free on bases: {__malloc_test_same_size_l63}
 [eva] Recording results for test_same_size
 [eva] Done for function test_same_size
@@ -118,7 +128,8 @@
 [eva] realloc2.c:70: Call to builtin realloc
 [eva] realloc2.c:70: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {}
-[eva] realloc2.c:70: allocating variable __realloc_test_imprecise_size_l70
+[eva:malloc:new] realloc2.c:70: 
+  allocating variable __realloc_test_imprecise_size_l70
 [eva:malloc] realloc2.c:70: strong free on bases: {}
 [eva] computing for function fill <- test_imprecise_size <- main.
   Called from realloc2.c:71.
@@ -132,7 +143,7 @@
 [eva] realloc2.c:76: Call to builtin realloc
 [eva] realloc2.c:76: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {}
-[eva] realloc2.c:76: 
+[eva:malloc:new] realloc2.c:76: 
   allocating variable __realloc_test_imprecise_size_but_precise_fill_l76
 [eva:malloc] realloc2.c:76: strong free on bases: {}
 [eva] computing for function fill <- test_imprecise_size_but_precise_fill <- main.
@@ -144,7 +155,8 @@
 [eva] computing for function test_imprecise_size_free <- main.
   Called from realloc2.c:203.
 [eva] realloc2.c:81: Call to builtin malloc
-[eva] realloc2.c:81: allocating variable __malloc_test_imprecise_size_free_l81
+[eva:malloc:new] realloc2.c:81: 
+  allocating variable __malloc_test_imprecise_size_free_l81
 [eva] computing for function fill <- test_imprecise_size_free <- main.
   Called from realloc2.c:82.
 [eva] Recording results for fill
@@ -152,7 +164,8 @@
 [eva] realloc2.c:84: Call to builtin realloc
 [eva] realloc2.c:84: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_imprecise_size_free_l81}
-[eva] realloc2.c:84: allocating variable __realloc_test_imprecise_size_free_l84
+[eva:malloc:new] realloc2.c:84: 
+  allocating variable __realloc_test_imprecise_size_free_l84
 [eva:malloc] realloc2.c:84: 
   strong free on bases: {__malloc_test_imprecise_size_free_l81}
 [eva] computing for function fill <- test_imprecise_size_free <- main.
@@ -164,11 +177,13 @@
 [eva] computing for function test_imprecise_both <- main.
   Called from realloc2.c:204.
 [eva] realloc2.c:89: Call to builtin malloc
-[eva] realloc2.c:89: allocating variable __malloc_test_imprecise_both_l89
+[eva:malloc:new] realloc2.c:89: 
+  allocating variable __malloc_test_imprecise_both_l89
 [eva] realloc2.c:91: Call to builtin realloc
 [eva] realloc2.c:91: function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_imprecise_both_l89}
-[eva] realloc2.c:91: allocating variable __realloc_test_imprecise_both_l91
+[eva:malloc:new] realloc2.c:91: 
+  allocating variable __realloc_test_imprecise_both_l91
 [eva:malloc] realloc2.c:91: 
   weak free on bases: {__malloc_test_imprecise_both_l89}
 [eva] computing for function fill <- test_imprecise_both <- main.
@@ -180,13 +195,13 @@
 [eva] computing for function test_possibly_invalid_realloc <- main.
   Called from realloc2.c:205.
 [eva] realloc2.c:96: Call to builtin malloc
-[eva] realloc2.c:96: 
+[eva:malloc:new] realloc2.c:96: 
   allocating variable __malloc_test_possibly_invalid_realloc_l96
 [eva] realloc2.c:99: Call to builtin realloc
 [eva:alarm] realloc2.c:99: Warning: 
   function realloc: precondition 'freeable' got status unknown.
 [eva:malloc] bases_to_realloc: {__malloc_test_possibly_invalid_realloc_l96}
-[eva] realloc2.c:99: 
+[eva:malloc:new] realloc2.c:99: 
   allocating variable __realloc_test_possibly_invalid_realloc_l99
 [eva:malloc] realloc2.c:99: 
   strong free on bases: {__malloc_test_possibly_invalid_realloc_l96}
@@ -199,7 +214,8 @@
 [eva] computing for function test_invalid_realloc <- main.
   Called from realloc2.c:206.
 [eva] realloc2.c:104: Call to builtin malloc
-[eva] realloc2.c:104: allocating variable __malloc_test_invalid_realloc_l104
+[eva:malloc:new] realloc2.c:104: 
+  allocating variable __malloc_test_invalid_realloc_l104
 [eva] realloc2.c:106: Call to builtin realloc
 [eva:alarm] realloc2.c:106: Warning: 
   function realloc: precondition 'freeable' got status invalid.
@@ -215,7 +231,8 @@
 [eva] computing for function test_invalid_realloc3 <- main.
   Called from realloc2.c:208.
 [eva] realloc2.c:116: Call to builtin malloc
-[eva] realloc2.c:116: allocating variable __malloc_test_invalid_realloc3_l116
+[eva:malloc:new] realloc2.c:116: 
+  allocating variable __malloc_test_invalid_realloc3_l116
 [eva] realloc2.c:119: Call to builtin realloc
 [eva:alarm] realloc2.c:119: Warning: 
   function realloc: precondition 'freeable' got status invalid.
@@ -224,19 +241,22 @@
 [eva] computing for function test_realloc_sequence <- main.
   Called from realloc2.c:209.
 [eva] realloc2.c:124: Call to builtin malloc
-[eva] realloc2.c:124: allocating variable __malloc_test_realloc_sequence_l124
+[eva:malloc:new] realloc2.c:124: 
+  allocating variable __malloc_test_realloc_sequence_l124
 [eva] realloc2.c:125: Call to builtin realloc
 [eva] realloc2.c:125: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_realloc_sequence_l124}
-[eva] realloc2.c:125: allocating variable __realloc_test_realloc_sequence_l125
+[eva:malloc:new] realloc2.c:125: 
+  allocating variable __realloc_test_realloc_sequence_l125
 [eva:malloc] realloc2.c:125: 
   strong free on bases: {__malloc_test_realloc_sequence_l124}
 [eva] realloc2.c:126: Call to builtin realloc
 [eva] realloc2.c:126: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__realloc_test_realloc_sequence_l125}
-[eva] realloc2.c:126: allocating variable __realloc_test_realloc_sequence_l126
+[eva:malloc:new] realloc2.c:126: 
+  allocating variable __realloc_test_realloc_sequence_l126
 [eva:malloc] realloc2.c:126: 
   strong free on bases: {__realloc_test_realloc_sequence_l125}
 [eva] computing for function fill <- test_realloc_sequence <- main.
@@ -248,7 +268,8 @@
 [eva] computing for function test_realloc_loop <- main.
   Called from realloc2.c:210.
 [eva] realloc2.c:131: Call to builtin malloc
-[eva] realloc2.c:131: allocating variable __malloc_test_realloc_loop_l131
+[eva:malloc:new] realloc2.c:131: 
+  allocating variable __malloc_test_realloc_loop_l131
 [eva] computing for function fill <- test_realloc_loop <- main.
   Called from realloc2.c:134.
 [eva] Recording results for fill
@@ -257,7 +278,8 @@
 [eva] realloc2.c:138: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_realloc_loop_l131}
-[eva] realloc2.c:138: allocating variable __realloc_test_realloc_loop_l138
+[eva:malloc:new] realloc2.c:138: 
+  allocating variable __realloc_test_realloc_loop_l138
 [eva:malloc] realloc2.c:138: 
   strong free on bases: {__malloc_test_realloc_loop_l131}
 [eva] computing for function fill <- test_realloc_loop <- main.
@@ -314,16 +336,16 @@
 [eva] computing for function test_realloc_multiple_bases <- main.
   Called from realloc2.c:211.
 [eva] realloc2.c:151: Call to builtin malloc
-[eva] realloc2.c:151: 
+[eva:malloc:new] realloc2.c:151: 
   allocating variable __malloc_test_realloc_multiple_bases_l151
 [eva] realloc2.c:154: Call to builtin malloc
-[eva] realloc2.c:154: 
+[eva:malloc:new] realloc2.c:154: 
   allocating variable __malloc_test_realloc_multiple_bases_l154
 [eva] realloc2.c:156: Call to builtin realloc
 [eva] realloc2.c:156: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_realloc_multiple_bases_l151}
-[eva] realloc2.c:156: 
+[eva:malloc:new] realloc2.c:156: 
   allocating variable __realloc_test_realloc_multiple_bases_l156
 [eva:malloc] realloc2.c:156: 
   strong free on bases: {__malloc_test_realloc_multiple_bases_l151}
@@ -333,7 +355,7 @@
 [eva:malloc] 
   bases_to_realloc: {__malloc_test_realloc_multiple_bases_l154,
                      __realloc_test_realloc_multiple_bases_l156}
-[eva] realloc2.c:158: 
+[eva:malloc:new] realloc2.c:158: 
   allocating variable __realloc_test_realloc_multiple_bases_l158
 [eva:malloc] realloc2.c:158: 
   weak free on bases: {__malloc_test_realloc_multiple_bases_l154,
@@ -347,7 +369,7 @@
 [eva] computing for function test_realloc_multiple_bases2 <- main.
   Called from realloc2.c:212.
 [eva] realloc2.c:163: Call to builtin malloc
-[eva] realloc2.c:163: 
+[eva:malloc:new] realloc2.c:163: 
   allocating variable __malloc_test_realloc_multiple_bases2_l163
 [eva] computing for function fill <- test_realloc_multiple_bases2 <- main.
   Called from realloc2.c:165.
@@ -357,12 +379,12 @@
 [eva] realloc2.c:166: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_realloc_multiple_bases2_l163}
-[eva] realloc2.c:166: 
+[eva:malloc:new] realloc2.c:166: 
   allocating variable __realloc_test_realloc_multiple_bases2_l166
 [eva:malloc] realloc2.c:166: 
   strong free on bases: {__malloc_test_realloc_multiple_bases2_l163}
 [eva] realloc2.c:166: Call to builtin malloc
-[eva] realloc2.c:166: 
+[eva:malloc:new] realloc2.c:166: 
   allocating variable __malloc_test_realloc_multiple_bases2_l166
 [eva] computing for function fill2 <- test_realloc_multiple_bases2 <- main.
   Called from realloc2.c:168.
@@ -374,7 +396,7 @@
 [eva:malloc] 
   bases_to_realloc: {__realloc_test_realloc_multiple_bases2_l166,
                      __malloc_test_realloc_multiple_bases2_l166}
-[eva] realloc2.c:169: 
+[eva:malloc:new] realloc2.c:169: 
   allocating variable __realloc_test_realloc_multiple_bases2_l169
 [eva:malloc] realloc2.c:169: 
   weak free on bases: {__realloc_test_realloc_multiple_bases2_l166,
@@ -383,7 +405,7 @@
 [eva] realloc2.c:171: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__realloc_test_realloc_multiple_bases2_l169}
-[eva] realloc2.c:171: 
+[eva:malloc:new] realloc2.c:171: 
   allocating variable __realloc_test_realloc_multiple_bases2_l171
 [eva:malloc] realloc2.c:171: 
   strong free on bases: {__realloc_test_realloc_multiple_bases2_l169}
@@ -392,7 +414,7 @@
 [eva] Recording results for fill
 [eva] Done for function fill
 [eva] realloc2.c:174: Call to builtin malloc
-[eva] realloc2.c:174: 
+[eva:malloc:new] realloc2.c:174: 
   allocating variable __malloc_test_realloc_multiple_bases2_l174
 [eva] computing for function fill2 <- test_realloc_multiple_bases2 <- main.
   Called from realloc2.c:176.
@@ -404,7 +426,7 @@
 [eva:malloc] 
   bases_to_realloc: {__realloc_test_realloc_multiple_bases2_l171,
                      __malloc_test_realloc_multiple_bases2_l174}
-[eva] realloc2.c:177: 
+[eva:malloc:new] realloc2.c:177: 
   allocating variable __realloc_test_realloc_multiple_bases2_l177
 [eva:malloc] realloc2.c:177: 
   weak free on bases: {__realloc_test_realloc_multiple_bases2_l171,
@@ -418,13 +440,13 @@
 [eva] computing for function test_realloc_multiple_bases_loop <- main.
   Called from realloc2.c:213.
 [eva] realloc2.c:184: Call to builtin malloc
-[eva] realloc2.c:184: 
+[eva:malloc:new] realloc2.c:184: 
   allocating variable __malloc_test_realloc_multiple_bases_loop_l184
 [eva] realloc2.c:187: Call to builtin realloc
 [eva] realloc2.c:187: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_test_realloc_multiple_bases_loop_l184}
-[eva] realloc2.c:187: 
+[eva:malloc:new] realloc2.c:187: 
   allocating variable __realloc_test_realloc_multiple_bases_loop_l187
 [eva:malloc] realloc2.c:187: 
   strong free on bases: {__malloc_test_realloc_multiple_bases_loop_l184}
@@ -432,7 +454,7 @@
   Called from realloc2.c:189.
 [eva] Recording results for fill
 [eva] Done for function fill
-[eva] realloc2.c:185: starting to merge loop iterations
+[eva:partition] realloc2.c:185: starting to merge loop iterations
 [eva] realloc2.c:187: Call to builtin realloc
 [eva:malloc] 
   bases_to_realloc: {__malloc_test_realloc_multiple_bases_loop_l184,
diff --git a/tests/builtins/oracle/realloc_multiple.0.res.oracle b/tests/builtins/oracle/realloc_multiple.0.res.oracle
index fb44822b047b19a0d570d183cd3f921fa2db2a0c..f03e0d480af47edd2684d0e1189b3332936bfb27 100644
--- a/tests/builtins/oracle/realloc_multiple.0.res.oracle
+++ b/tests/builtins/oracle/realloc_multiple.0.res.oracle
@@ -7,9 +7,9 @@
 [eva] computing for function main1 <- main.
   Called from realloc_multiple.c:75.
 [eva] realloc_multiple.c:9: Call to builtin malloc
-[eva] realloc_multiple.c:9: allocating variable __malloc_main1_l9
+[eva:malloc:new] realloc_multiple.c:9: allocating variable __malloc_main1_l9
 [eva] realloc_multiple.c:12: Call to builtin malloc
-[eva] realloc_multiple.c:12: allocating variable __malloc_main1_l12
+[eva:malloc:new] realloc_multiple.c:12: allocating variable __malloc_main1_l12
 [eva] computing for function Frama_C_interval <- main1 <- main.
   Called from realloc_multiple.c:16.
 [eva] using specification for function Frama_C_interval
@@ -48,9 +48,10 @@
 [eva] realloc_multiple.c:23: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main1_l12}
-[eva] realloc_multiple.c:23: allocating variable __realloc_main1_l23
+[eva:malloc:new] realloc_multiple.c:23: allocating variable __realloc_main1_l23
 [eva:malloc] bases_to_realloc: {__malloc_main1_l9}
-[eva] realloc_multiple.c:23: allocating variable __realloc_main1_l23_0
+[eva:malloc:new] realloc_multiple.c:23: 
+  allocating variable __realloc_main1_l23_0
 [eva:malloc] realloc_multiple.c:23: 
   weak free on bases: {__malloc_main1_l9, __malloc_main1_l12}
 [eva] realloc_multiple.c:25: 
@@ -95,9 +96,9 @@
 [eva] computing for function main2 <- main.
   Called from realloc_multiple.c:76.
 [eva] realloc_multiple.c:30: Call to builtin malloc
-[eva] realloc_multiple.c:30: allocating variable __malloc_main2_l30
+[eva:malloc:new] realloc_multiple.c:30: allocating variable __malloc_main2_l30
 [eva] realloc_multiple.c:33: Call to builtin malloc
-[eva] realloc_multiple.c:33: allocating variable __malloc_main2_l33
+[eva:malloc:new] realloc_multiple.c:33: allocating variable __malloc_main2_l33
 [eva] computing for function Frama_C_interval <- main2 <- main.
   Called from realloc_multiple.c:37.
 [eva] realloc_multiple.c:37: 
@@ -135,11 +136,13 @@
 [eva] realloc_multiple.c:45: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main2_l33}
-[eva] realloc_multiple.c:45: allocating variable __realloc_main2_l45
+[eva:malloc:new] realloc_multiple.c:45: allocating variable __realloc_main2_l45
 [eva:malloc] bases_to_realloc: {__malloc_main2_l30}
-[eva] realloc_multiple.c:45: allocating variable __realloc_main2_l45_0
+[eva:malloc:new] realloc_multiple.c:45: 
+  allocating variable __realloc_main2_l45_0
 [eva:malloc] bases_to_realloc: {}
-[eva] realloc_multiple.c:45: allocating variable __realloc_main2_l45_1
+[eva:malloc:new] realloc_multiple.c:45: 
+  allocating variable __realloc_main2_l45_1
 [eva:malloc] realloc_multiple.c:45: 
   weak free on bases: {__malloc_main2_l30, __malloc_main2_l33}
 [eva] realloc_multiple.c:47: 
@@ -189,9 +192,9 @@
 [eva] computing for function main3 <- main.
   Called from realloc_multiple.c:77.
 [eva] realloc_multiple.c:52: Call to builtin malloc
-[eva] realloc_multiple.c:52: allocating variable __malloc_main3_l52
+[eva:malloc:new] realloc_multiple.c:52: allocating variable __malloc_main3_l52
 [eva] realloc_multiple.c:53: Call to builtin malloc
-[eva] realloc_multiple.c:53: allocating variable __malloc_main3_l53
+[eva:malloc:new] realloc_multiple.c:53: allocating variable __malloc_main3_l53
 [eva] computing for function Frama_C_interval <- main3 <- main.
   Called from realloc_multiple.c:59.
 [eva] realloc_multiple.c:59: 
@@ -231,11 +234,13 @@
 [eva] realloc_multiple.c:65: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main3_l53}
-[eva] realloc_multiple.c:65: allocating variable __realloc_main3_l65
+[eva:malloc:new] realloc_multiple.c:65: allocating variable __realloc_main3_l65
 [eva:malloc] bases_to_realloc: {__malloc_main3_l52}
-[eva] realloc_multiple.c:65: allocating variable __realloc_main3_l65_0
+[eva:malloc:new] realloc_multiple.c:65: 
+  allocating variable __realloc_main3_l65_0
 [eva:malloc] bases_to_realloc: {}
-[eva] realloc_multiple.c:65: allocating variable __realloc_main3_l65_1
+[eva:malloc:new] realloc_multiple.c:65: 
+  allocating variable __realloc_main3_l65_1
 [eva:malloc] realloc_multiple.c:65: 
   weak free on bases: {__malloc_main3_l52, __malloc_main3_l53}
 [eva:alarm] realloc_multiple.c:66: Warning: 
diff --git a/tests/builtins/oracle/realloc_multiple.1.res.oracle b/tests/builtins/oracle/realloc_multiple.1.res.oracle
index c076efb3a39138ab0e7e59070fbf2c4885bea4cd..3574b221894ff9a2ececd4cbea37625cbb03f7f4 100644
--- a/tests/builtins/oracle/realloc_multiple.1.res.oracle
+++ b/tests/builtins/oracle/realloc_multiple.1.res.oracle
@@ -7,13 +7,13 @@
 [eva] computing for function main1 <- main.
   Called from realloc_multiple.c:75.
 [eva] realloc_multiple.c:9: Call to builtin malloc
-[eva] realloc_multiple.c:9: allocating variable __malloc_main1_l9
+[eva:malloc:new] realloc_multiple.c:9: allocating variable __malloc_main1_l9
 [eva:alarm] realloc_multiple.c:10: Warning: 
   out of bounds write. assert \valid(q + i);
 [kernel] realloc_multiple.c:10: Warning: 
   all target addresses were invalid. This path is assumed to be dead.
 [eva] realloc_multiple.c:12: Call to builtin malloc
-[eva] realloc_multiple.c:12: allocating variable __malloc_main1_l12
+[eva:malloc:new] realloc_multiple.c:12: allocating variable __malloc_main1_l12
 [eva:alarm] realloc_multiple.c:13: Warning: 
   out of bounds write. assert \valid(r + i_0);
 [kernel] realloc_multiple.c:13: Warning: 
@@ -56,9 +56,10 @@
 [eva] realloc_multiple.c:23: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main1_l12}
-[eva] realloc_multiple.c:23: allocating variable __realloc_main1_l23
+[eva:malloc:new] realloc_multiple.c:23: allocating variable __realloc_main1_l23
 [eva:malloc] bases_to_realloc: {__malloc_main1_l9}
-[eva] realloc_multiple.c:23: allocating variable __realloc_main1_l23_0
+[eva:malloc:new] realloc_multiple.c:23: 
+  allocating variable __realloc_main1_l23_0
 [eva:malloc] realloc_multiple.c:23: 
   weak free on bases: {__malloc_main1_l9, __malloc_main1_l12}
 [eva] realloc_multiple.c:25: 
@@ -133,13 +134,13 @@
 [eva] computing for function main2 <- main.
   Called from realloc_multiple.c:76.
 [eva] realloc_multiple.c:30: Call to builtin malloc
-[eva] realloc_multiple.c:30: allocating variable __malloc_main2_l30
+[eva:malloc:new] realloc_multiple.c:30: allocating variable __malloc_main2_l30
 [eva:alarm] realloc_multiple.c:31: Warning: 
   out of bounds write. assert \valid(q + i);
 [kernel] realloc_multiple.c:31: Warning: 
   all target addresses were invalid. This path is assumed to be dead.
 [eva] realloc_multiple.c:33: Call to builtin malloc
-[eva] realloc_multiple.c:33: allocating variable __malloc_main2_l33
+[eva:malloc:new] realloc_multiple.c:33: allocating variable __malloc_main2_l33
 [eva:alarm] realloc_multiple.c:34: Warning: 
   out of bounds write. assert \valid(r + i_0);
 [kernel] realloc_multiple.c:34: Warning: 
@@ -181,11 +182,13 @@
 [eva] realloc_multiple.c:45: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main2_l33}
-[eva] realloc_multiple.c:45: allocating variable __realloc_main2_l45
+[eva:malloc:new] realloc_multiple.c:45: allocating variable __realloc_main2_l45
 [eva:malloc] bases_to_realloc: {__malloc_main2_l30}
-[eva] realloc_multiple.c:45: allocating variable __realloc_main2_l45_0
+[eva:malloc:new] realloc_multiple.c:45: 
+  allocating variable __realloc_main2_l45_0
 [eva:malloc] bases_to_realloc: {}
-[eva] realloc_multiple.c:45: allocating variable __realloc_main2_l45_1
+[eva:malloc:new] realloc_multiple.c:45: 
+  allocating variable __realloc_main2_l45_1
 [eva:malloc] realloc_multiple.c:45: 
   weak free on bases: {__malloc_main2_l30, __malloc_main2_l33}
 [eva] realloc_multiple.c:47: 
@@ -265,11 +268,11 @@
 [eva] computing for function main3 <- main.
   Called from realloc_multiple.c:77.
 [eva] realloc_multiple.c:52: Call to builtin malloc
-[eva] realloc_multiple.c:52: allocating variable __malloc_main3_l52
+[eva:malloc:new] realloc_multiple.c:52: allocating variable __malloc_main3_l52
 [eva] realloc_multiple.c:53: Call to builtin malloc
-[eva] realloc_multiple.c:53: allocating variable __malloc_main3_l53
+[eva:malloc:new] realloc_multiple.c:53: allocating variable __malloc_main3_l53
 [eva] realloc_multiple.c:53: Call to builtin malloc
-[eva] realloc_multiple.c:53: allocating variable __malloc_main3_l53_0
+[eva:malloc:new] realloc_multiple.c:53: allocating variable __malloc_main3_l53_0
 [eva:alarm] realloc_multiple.c:57: Warning: 
   out of bounds write. assert \valid(p);
 [kernel] realloc_multiple.c:57: Warning: 
@@ -317,11 +320,13 @@
 [eva] realloc_multiple.c:65: 
   function realloc: precondition 'freeable' got status valid.
 [eva:malloc] bases_to_realloc: {__malloc_main3_l53}
-[eva] realloc_multiple.c:65: allocating variable __realloc_main3_l65
+[eva:malloc:new] realloc_multiple.c:65: allocating variable __realloc_main3_l65
 [eva:malloc] bases_to_realloc: {__malloc_main3_l52}
-[eva] realloc_multiple.c:65: allocating variable __realloc_main3_l65_0
+[eva:malloc:new] realloc_multiple.c:65: 
+  allocating variable __realloc_main3_l65_0
 [eva:malloc] bases_to_realloc: {}
-[eva] realloc_multiple.c:65: allocating variable __realloc_main3_l65_1
+[eva:malloc:new] realloc_multiple.c:65: 
+  allocating variable __realloc_main3_l65_1
 [eva:malloc] realloc_multiple.c:65: 
   weak free on bases: {__malloc_main3_l52, __malloc_main3_l53}
 [eva:alarm] realloc_multiple.c:66: Warning: 
diff --git a/tests/builtins/oracle/str_allocated.res.oracle b/tests/builtins/oracle/str_allocated.res.oracle
index cdd369361befe66a55caf18165d58ad4b5219c15..8983fda3390d701de717d161f933890fa152dc36 100644
--- a/tests/builtins/oracle/str_allocated.res.oracle
+++ b/tests/builtins/oracle/str_allocated.res.oracle
@@ -7,8 +7,8 @@
 [eva] computing for function memchr_bug <- main.
   Called from str_allocated.c:19.
 [eva] str_allocated.c:12: Call to builtin malloc
-[eva] str_allocated.c:12: allocating variable __malloc_memchr_bug_l12
-[eva] str_allocated.c:11: starting to merge loop iterations
+[eva:malloc:new] str_allocated.c:12: allocating variable __malloc_memchr_bug_l12
+[eva:partition] str_allocated.c:11: starting to merge loop iterations
 [eva] str_allocated.c:12: Call to builtin malloc
 [eva:malloc:weak] str_allocated.c:12: 
   marking variable `__malloc_memchr_bug_l12' as weak
diff --git a/tests/builtins/oracle/strchr.res.oracle b/tests/builtins/oracle/strchr.res.oracle
index 577719cd86ef80768246197af5191e065dbb9caf..614f43290ddbee39e64c02e00484b8fef149ffb5 100644
--- a/tests/builtins/oracle/strchr.res.oracle
+++ b/tests/builtins/oracle/strchr.res.oracle
@@ -285,7 +285,7 @@
   pointer subtraction. assert \base_addr(_ss) ≡ \base_addr(s1);
 [eva] strchr.c:335: Frama_C_show_each_mystrchr: {3; 4}
 [eva] strchr.c:336: assertion got status valid.
-[eva] strchr.c:334: starting to merge loop iterations
+[eva:partition] strchr.c:334: starting to merge loop iterations
 [eva] strchr.c:335: Call to builtin strchr
 [eva] strchr.c:335: Frama_C_show_each_mystrchr: {3; 4}
 [eva] strchr.c:335: Call to builtin strchr
diff --git a/tests/builtins/oracle/strlen.res.oracle b/tests/builtins/oracle/strlen.res.oracle
index 2d6111ad504c8c66aa1ac8687f42aca02f9f58ae..665d7a87902363425be036a847122be246f49d9d 100644
--- a/tests/builtins/oracle/strlen.res.oracle
+++ b/tests/builtins/oracle/strlen.res.oracle
@@ -232,7 +232,7 @@
 [eva] strlen.c:270: 
   function strlen: precondition 'valid_string_s' got status valid.
 [eva] strlen.c:271: assertion got status valid.
-[eva] strlen.c:269: starting to merge loop iterations
+[eva:partition] strlen.c:269: starting to merge loop iterations
 [eva] strlen.c:270: Call to builtin strlen
 [eva] strlen.c:270: Call to builtin strlen
 [eva] strlen.c:270: Call to builtin strlen
@@ -303,7 +303,7 @@
 [eva] Done for function big_array
 [eva] computing for function negative_offsets <- main.
   Called from strlen.c:360.
-[eva] strlen.c:310: starting to merge loop iterations
+[eva:partition] strlen.c:310: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- negative_offsets <- main.
   Called from strlen.c:314.
 [eva] strlen.c:314: 
diff --git a/tests/builtins/oracle/strnlen2.res.oracle b/tests/builtins/oracle/strnlen2.res.oracle
index e801b85f73681042a8b9a78d6fe49534bc6f496e..137bfa8c095178f49ec37e5ff044c010bd7a53d9 100644
--- a/tests/builtins/oracle/strnlen2.res.oracle
+++ b/tests/builtins/oracle/strnlen2.res.oracle
@@ -232,7 +232,7 @@
 [eva] strnlen2.c:244: 
   function strnlen: precondition 'valid_string_s' got status valid.
 [eva] strnlen2.c:245: assertion got status valid.
-[eva] strnlen2.c:243: starting to merge loop iterations
+[eva:partition] strnlen2.c:243: starting to merge loop iterations
 [eva] strnlen2.c:244: Call to builtin strnlen
 [eva] strnlen2.c:244: Call to builtin strnlen
 [eva] strnlen2.c:244: Call to builtin strnlen
@@ -667,7 +667,7 @@
 [eva] Done for function intervals
 [eva] computing for function negative_offsets <- main.
   Called from strnlen2.c:532.
-[eva] strnlen2.c:489: starting to merge loop iterations
+[eva:partition] strnlen2.c:489: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- negative_offsets <- main.
   Called from strnlen2.c:493.
 [eva] strnlen2.c:493: 
diff --git a/tests/builtins/oracle/vla.res.oracle b/tests/builtins/oracle/vla.res.oracle
index 1757cd12649c3c456892ba1a7b365485b950ab5f..a35b15624db208266383005d53d05369ba6f5fc6 100644
--- a/tests/builtins/oracle/vla.res.oracle
+++ b/tests/builtins/oracle/vla.res.oracle
@@ -8,13 +8,13 @@
   Called from vla.c:20.
 [eva] vla.c:6: assertion 'alloca_bounds' got status valid.
 [eva] vla.c:6: Call to builtin __fc_vla_alloc
-[eva] vla.c:6: allocating variable __malloc_f_l6
+[eva:malloc:new] vla.c:6: allocating variable __malloc_f_l6
 [eva] vla.c:7: Frama_C_show_each: {{ &__malloc_f_l6 }}
 [eva] vla.c:6: Call to builtin __fc_vla_free
 [eva:malloc] vla.c:6: strong free on bases: {__malloc_f_l6}
 [eva] Recording results for f
 [eva] Done for function f
-[eva] vla.c:20: freeing automatic bases: {__malloc_f_l6}
+[eva:malloc:automatic-free] vla.c:20: freeing automatic bases: {__malloc_f_l6}
 [eva:malloc] vla.c:20: strong free on bases: {__malloc_f_l6}
 [eva] computing for function f <- main.
   Called from vla.c:20.
diff --git a/tests/builtins/oracle/wcslen.res.oracle b/tests/builtins/oracle/wcslen.res.oracle
index 3e0d35cee3c437048553e0cf28553b7f08c952dc..b0d049659718f27738068ac3188214ba06dde296 100644
--- a/tests/builtins/oracle/wcslen.res.oracle
+++ b/tests/builtins/oracle/wcslen.res.oracle
@@ -232,7 +232,7 @@
 [eva] wcslen.c:270: 
   function wcslen: precondition 'valid_string_s' got status valid.
 [eva] wcslen.c:271: assertion got status valid.
-[eva] wcslen.c:269: starting to merge loop iterations
+[eva:partition] wcslen.c:269: starting to merge loop iterations
 [eva] wcslen.c:270: Call to builtin wcslen
 [eva] wcslen.c:270: Call to builtin wcslen
 [eva] wcslen.c:270: Call to builtin wcslen
@@ -309,7 +309,7 @@
 [eva] Done for function big_array
 [eva] computing for function negative_offsets <- main.
   Called from wcslen.c:380.
-[eva] wcslen.c:314: starting to merge loop iterations
+[eva:partition] wcslen.c:314: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- negative_offsets <- main.
   Called from wcslen.c:318.
 [eva] wcslen.c:318: 
diff --git a/tests/builtins/oracle_equality/alloc_weak.res.oracle b/tests/builtins/oracle_equality/alloc_weak.res.oracle
index 1e76e3d24088d209f4e6d5d676d096428794c874..5d7fe9ed142e03f0948483559487324b454bd5f1 100644
--- a/tests/builtins/oracle_equality/alloc_weak.res.oracle
+++ b/tests/builtins/oracle_equality/alloc_weak.res.oracle
@@ -1,13 +1,13 @@
 34,35d33
 < [eva:alarm] alloc_weak.c:30: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p);
-119,121c117
+121,123c119
 <   p ∈
 <    {{ &__calloc_convergence_issue_l73 ;
 <       &__calloc_w_convergence_issue_l82[0] }}
 ---
 >   p ∈ {{ &__calloc_w_convergence_issue_l82[0] }}
-947c943
+949c945
 <   r ∈ [--..--]
 ---
 >   r ∈ {42}
diff --git a/tests/builtins/oracle_equality/allocated.1.res.oracle b/tests/builtins/oracle_equality/allocated.1.res.oracle
index 07f6b70bfde49280d8694fcf62a4517fa2e177d6..588f739639ff438b5f01303d4e80ed2bcefbb80a 100644
--- a/tests/builtins/oracle_equality/allocated.1.res.oracle
+++ b/tests/builtins/oracle_equality/allocated.1.res.oracle
@@ -1,6 +1,6 @@
 135a136,137
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 146a149,150
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 > [eva] allocated.c:87: Call to builtin free
@@ -12,27 +12,27 @@
 > [eva] allocated.c:87: Call to builtin free
 176,177c184,185
 < [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+< [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 ---
 > [eva] allocated.c:87: Call to builtin free
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 223a232,245
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_31
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_32
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_33
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_34
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_35
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_36
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_37
 226d247
-< [eva] allocated.c:84: Trace partitioning superposing up to 300 states
+< [eva:partition] allocated.c:84: Trace partitioning superposing up to 300 states
 228a250,263
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
 > [eva] allocated.c:87: Call to builtin free
@@ -164,7 +164,7 @@
 < [eva] allocated.c:87: Call to builtin free
 < [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 ---
-> [eva] allocated.c:81: Trace partitioning superposing up to 500 states
+> [eva:partition] allocated.c:81: Trace partitioning superposing up to 500 states
 721,723c839,840
 <   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
 <                      [1] ∈ {24} or UNINITIALIZED
diff --git a/tests/builtins/oracle_equality/malloc-optimistic.res.oracle b/tests/builtins/oracle_equality/malloc-optimistic.res.oracle
index e2b025a8698a2d0152d7d8b490bffd1e6631af14..550a6f5884284eb25beae76bb38a15c69599c0e1 100644
--- a/tests/builtins/oracle_equality/malloc-optimistic.res.oracle
+++ b/tests/builtins/oracle_equality/malloc-optimistic.res.oracle
@@ -1,249 +1,249 @@
-495,496d494
+497,498d496
 < [eva:alarm] malloc-optimistic.c:79: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-504c502
+506c504
 <   k ∈ {-2; -1}
 ---
 >   k ∈ {-1}
-539c537
+541c539
 <   k ∈ {-1; 0}
 ---
 >   k ∈ {0}
-576c574
+578c576
 <   k ∈ {0; 1}
 ---
 >   k ∈ {1}
-615c613
+617c615
 <   k ∈ {1; 2}
 ---
 >   k ∈ {2}
-656c654
+658c656
 <   k ∈ {2; 3}
 ---
 >   k ∈ {3}
-699c697
+701c699
 <   k ∈ {3; 4}
 ---
 >   k ∈ {4}
-744c742
+746c744
 <   k ∈ {4; 5}
 ---
 >   k ∈ {5}
-791c789
+793c791
 <   k ∈ {5; 6}
 ---
 >   k ∈ {6}
-840c838
+842c840
 <   k ∈ {6; 7}
 ---
 >   k ∈ {7}
-1757,1758d1754
+1759,1760d1756
 < [eva:alarm] malloc-optimistic.c:92: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-1944,1945d1939
+1947,1948d1942
 < [eva:alarm] malloc-optimistic.c:105: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-1953c1947
+1956c1950
 <   k ∈ {-2; -1}
 ---
 >   k ∈ {-1}
-2011c2005
+2014c2008
 <   k ∈ {-1; 0}
 ---
 >   k ∈ {0}
-2071c2065
+2074c2068
 <   k ∈ {0; 1}
 ---
 >   k ∈ {1}
-2133c2127
+2136c2130
 <   k ∈ {1; 2}
 ---
 >   k ∈ {2}
-2197c2191
+2200c2194
 <   k ∈ {2; 3}
 ---
 >   k ∈ {3}
-2263c2257
+2266c2260
 <   k ∈ {3; 4}
 ---
 >   k ∈ {4}
-2331c2325
+2334c2328
 <   k ∈ {4; 5}
 ---
 >   k ∈ {5}
-2401c2395
+2404c2398
 <   k ∈ {5; 6}
 ---
 >   k ∈ {6}
-2473c2467
+2476c2470
 <   k ∈ {6; 7}
 ---
 >   k ∈ {7}
-2547c2541
+2550c2544
 <   k ∈ {7; 8}
 ---
 >   k ∈ {8}
-2623c2617
+2626c2620
 <   k ∈ {8; 9}
 ---
 >   k ∈ {9}
-2701c2695
+2704c2698
 <   k ∈ {9; 10}
 ---
 >   k ∈ {10}
-2781c2775
+2784c2778
 <   k ∈ {10; 11}
 ---
 >   k ∈ {11}
-2863c2857
+2866c2860
 <   k ∈ {11; 12}
 ---
 >   k ∈ {12}
-2944c2938
+2947c2941
 <   k ∈ {12; 13}
 ---
 >   k ∈ {13}
-2990c2984
+2993c2987
 <   k ∈ {12; 13; 14}
 ---
 >   k ∈ {13; 14}
-3035c3029
+3038c3032
 <   k ∈ {12; 13; 14; 15}
 ---
 >   k ∈ {13; 14; 15}
-3080c3074
+3083c3077
 <   k ∈ [12..97]
 ---
 >   k ∈ [13..97]
-3136c3130
+3140c3134
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {1}
-3144c3138
+3148c3142
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {2}
-3152c3146
+3156c3150
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {3}
-3160c3154
+3164c3158
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {4}
-3168c3162
+3172c3166
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {5}
-3176c3170
+3180c3174
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {6}
-3184c3178
+3188c3182
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6; 7}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {7}
-3192c3186
+3196c3190
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..8]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {8}
-3200c3194
+3204c3198
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..9]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {9}
-3208c3202
+3212c3206
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..10]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {10}
-3216c3210
+3220c3214
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..11]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {11}
-3224c3218
+3228c3222
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..12]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {12}
-3232c3226
+3236c3230
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..13]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {13}
-3240c3234
+3244c3238
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..14]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {14}
-3248c3242
+3252c3246
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..15]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {15}
-3256c3250
+3260c3254
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..16]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {16}
-3264c3258
+3268c3262
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..17]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {17}
-3272c3266
+3276c3270
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..18]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {18}
-3280c3274
+3284c3278
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..19]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {19}
-3288c3282
+3292c3286
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..20]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {20}
-3296c3290
+3300c3294
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..21]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {21}
-3304c3298
+3308c3302
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..22]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {22}
-3312c3306
+3316c3310
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..23]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {23}
-3320c3314
+3324c3318
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..24]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {24}
-3328c3322
+3332c3326
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..25]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {25}
-3336c3330
+3340c3334
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..26]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {26}
-3344c3338
+3348c3342
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..27]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {27}
-3352c3346
+3356c3350
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..28]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {28}
-3360c3354
+3364c3358
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..29]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {29}
-3368c3362
+3372c3366
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..30]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30}
-3377c3371
+3381c3375
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..31]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31}
-3385c3379
+3389c3383
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..32]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31; 32}
-3393c3387
+3397c3391
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..99]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: [30..99]
diff --git a/tests/builtins/oracle_gauges/memcpy.0.res.oracle b/tests/builtins/oracle_gauges/memcpy.0.res.oracle
index 7fa2ad9c849599b9e4314ca1094afabc9d067b95..82cbb875ec7c4f2443fa62ac803be09b18b3d11b 100644
--- a/tests/builtins/oracle_gauges/memcpy.0.res.oracle
+++ b/tests/builtins/oracle_gauges/memcpy.0.res.oracle
@@ -2,4 +2,4 @@
 > [eva] memcpy.c:100: Call to builtin memcpy
 > [eva] memcpy.c:100: Call to builtin memcpy
 373a376
-> [eva] memcpy.c:231: starting to merge loop iterations
+> [eva:partition] memcpy.c:231: starting to merge loop iterations
diff --git a/tests/builtins/oracle_gauges/realloc.res.oracle b/tests/builtins/oracle_gauges/realloc.res.oracle
index b61ec8f618bcc743656c990a8338abba067675e6..1874a373987ac2de34557be3868988ba0cbf041b 100644
--- a/tests/builtins/oracle_gauges/realloc.res.oracle
+++ b/tests/builtins/oracle_gauges/realloc.res.oracle
@@ -260,7 +260,7 @@
 >   __realloc_w_main10_l152[0] ∈ {4}
 >                          [1] ∈ UNINITIALIZED
 >   ==END OF DUMP==
-> [eva] realloc.c:150: starting to merge loop iterations
+> [eva:partition] realloc.c:150: starting to merge loop iterations
 > [eva] realloc.c:152: Call to builtin realloc
 > [eva:malloc] bases_to_realloc: {__realloc_w_main10_l152}
 > [eva:malloc] realloc.c:152: weak free on bases: {__realloc_w_main10_l152}
@@ -380,7 +380,7 @@
 >   marking variable `__realloc_main11_l171' as weak
 > [eva:malloc] realloc.c:171: strong free on bases: {}
 > [eva] realloc.c:172: Frama_C_show_each_p: {{ NULL ; &__realloc_w_main11_l171 }}
-> [eva] realloc.c:163: starting to merge loop iterations
+> [eva:partition] realloc.c:163: starting to merge loop iterations
 > [eva] realloc.c:165: Call to builtin reallocarray
 > [eva:malloc] bases_to_realloc: {__realloc_w_main11_l171}
 > [eva:malloc] realloc.c:165: weak free on bases: {__realloc_w_main11_l171}
diff --git a/tests/builtins/oracle_multidim/allocated.1.res.oracle b/tests/builtins/oracle_multidim/allocated.1.res.oracle
index 07f6b70bfde49280d8694fcf62a4517fa2e177d6..588f739639ff438b5f01303d4e80ed2bcefbb80a 100644
--- a/tests/builtins/oracle_multidim/allocated.1.res.oracle
+++ b/tests/builtins/oracle_multidim/allocated.1.res.oracle
@@ -1,6 +1,6 @@
 135a136,137
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 146a149,150
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 > [eva] allocated.c:87: Call to builtin free
@@ -12,27 +12,27 @@
 > [eva] allocated.c:87: Call to builtin free
 176,177c184,185
 < [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+< [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 ---
 > [eva] allocated.c:87: Call to builtin free
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 223a232,245
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_31
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_32
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_33
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_34
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_35
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_36
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_37
 226d247
-< [eva] allocated.c:84: Trace partitioning superposing up to 300 states
+< [eva:partition] allocated.c:84: Trace partitioning superposing up to 300 states
 228a250,263
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
 > [eva] allocated.c:87: Call to builtin free
@@ -164,7 +164,7 @@
 < [eva] allocated.c:87: Call to builtin free
 < [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 ---
-> [eva] allocated.c:81: Trace partitioning superposing up to 500 states
+> [eva:partition] allocated.c:81: Trace partitioning superposing up to 500 states
 721,723c839,840
 <   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
 <                      [1] ∈ {24} or UNINITIALIZED
diff --git a/tests/builtins/oracle_octagon/allocated.1.res.oracle b/tests/builtins/oracle_octagon/allocated.1.res.oracle
index 07f6b70bfde49280d8694fcf62a4517fa2e177d6..588f739639ff438b5f01303d4e80ed2bcefbb80a 100644
--- a/tests/builtins/oracle_octagon/allocated.1.res.oracle
+++ b/tests/builtins/oracle_octagon/allocated.1.res.oracle
@@ -1,6 +1,6 @@
 135a136,137
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 146a149,150
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 > [eva] allocated.c:87: Call to builtin free
@@ -12,27 +12,27 @@
 > [eva] allocated.c:87: Call to builtin free
 176,177c184,185
 < [eva] allocated.c:82: Call to builtin malloc
-< [eva] allocated.c:82: allocating variable __malloc_main_l82_7
+< [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_7
 ---
 > [eva] allocated.c:87: Call to builtin free
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 223a232,245
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_31
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_31
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_32
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_32
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_33
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_33
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_34
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_34
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_35
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_35
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_36
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_36
 > [eva] allocated.c:82: Call to builtin malloc
-> [eva] allocated.c:82: allocating variable __malloc_main_l82_37
+> [eva:malloc:new] allocated.c:82: allocating variable __malloc_main_l82_37
 226d247
-< [eva] allocated.c:84: Trace partitioning superposing up to 300 states
+< [eva:partition] allocated.c:84: Trace partitioning superposing up to 300 states
 228a250,263
 > [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_37}
 > [eva] allocated.c:87: Call to builtin free
@@ -164,7 +164,7 @@
 < [eva] allocated.c:87: Call to builtin free
 < [eva:malloc] allocated.c:87: strong free on bases: {__malloc_main_l82_7}
 ---
-> [eva] allocated.c:81: Trace partitioning superposing up to 500 states
+> [eva:partition] allocated.c:81: Trace partitioning superposing up to 500 states
 721,723c839,840
 <   __malloc_main_l82_7[0] ∈ {21} or UNINITIALIZED
 <                      [1] ∈ {24} or UNINITIALIZED
diff --git a/tests/builtins/oracle_octagon/malloc-optimistic.res.oracle b/tests/builtins/oracle_octagon/malloc-optimistic.res.oracle
index daac1b434ded67a861122a87a00471fc54b736f8..141126938150477dc7c0d285e631c5216b870df5 100644
--- a/tests/builtins/oracle_octagon/malloc-optimistic.res.oracle
+++ b/tests/builtins/oracle_octagon/malloc-optimistic.res.oracle
@@ -1,8 +1,8 @@
-3441c3441
+3445c3445
 <   i ∈ [14..100]
 ---
 >   i ∈ {98; 99; 100}
-3445c3445
+3449c3449
 <   i ∈ [14..100]
 ---
 >   i ∈ {98; 99; 100}
diff --git a/tests/builtins/oracle_symblocs/alloc_weak.res.oracle b/tests/builtins/oracle_symblocs/alloc_weak.res.oracle
index 85115be80a4aa92d0e05dd0e5c8da87d19bace63..c4476fc435c7a12f231c814bedacfb65ebf405af 100644
--- a/tests/builtins/oracle_symblocs/alloc_weak.res.oracle
+++ b/tests/builtins/oracle_symblocs/alloc_weak.res.oracle
@@ -1,7 +1,7 @@
 34,35d33
 < [eva:alarm] alloc_weak.c:30: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p);
-947c945
+949c947
 <   r ∈ [--..--]
 ---
 >   r ∈ {42}
diff --git a/tests/builtins/oracle_symblocs/malloc-optimistic.res.oracle b/tests/builtins/oracle_symblocs/malloc-optimistic.res.oracle
index e2b025a8698a2d0152d7d8b490bffd1e6631af14..550a6f5884284eb25beae76bb38a15c69599c0e1 100644
--- a/tests/builtins/oracle_symblocs/malloc-optimistic.res.oracle
+++ b/tests/builtins/oracle_symblocs/malloc-optimistic.res.oracle
@@ -1,249 +1,249 @@
-495,496d494
+497,498d496
 < [eva:alarm] malloc-optimistic.c:79: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-504c502
+506c504
 <   k ∈ {-2; -1}
 ---
 >   k ∈ {-1}
-539c537
+541c539
 <   k ∈ {-1; 0}
 ---
 >   k ∈ {0}
-576c574
+578c576
 <   k ∈ {0; 1}
 ---
 >   k ∈ {1}
-615c613
+617c615
 <   k ∈ {1; 2}
 ---
 >   k ∈ {2}
-656c654
+658c656
 <   k ∈ {2; 3}
 ---
 >   k ∈ {3}
-699c697
+701c699
 <   k ∈ {3; 4}
 ---
 >   k ∈ {4}
-744c742
+746c744
 <   k ∈ {4; 5}
 ---
 >   k ∈ {5}
-791c789
+793c791
 <   k ∈ {5; 6}
 ---
 >   k ∈ {6}
-840c838
+842c840
 <   k ∈ {6; 7}
 ---
 >   k ∈ {7}
-1757,1758d1754
+1759,1760d1756
 < [eva:alarm] malloc-optimistic.c:92: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-1944,1945d1939
+1947,1948d1942
 < [eva:alarm] malloc-optimistic.c:105: Warning: 
 <   accessing uninitialized left-value. assert \initialized(p + i);
-1953c1947
+1956c1950
 <   k ∈ {-2; -1}
 ---
 >   k ∈ {-1}
-2011c2005
+2014c2008
 <   k ∈ {-1; 0}
 ---
 >   k ∈ {0}
-2071c2065
+2074c2068
 <   k ∈ {0; 1}
 ---
 >   k ∈ {1}
-2133c2127
+2136c2130
 <   k ∈ {1; 2}
 ---
 >   k ∈ {2}
-2197c2191
+2200c2194
 <   k ∈ {2; 3}
 ---
 >   k ∈ {3}
-2263c2257
+2266c2260
 <   k ∈ {3; 4}
 ---
 >   k ∈ {4}
-2331c2325
+2334c2328
 <   k ∈ {4; 5}
 ---
 >   k ∈ {5}
-2401c2395
+2404c2398
 <   k ∈ {5; 6}
 ---
 >   k ∈ {6}
-2473c2467
+2476c2470
 <   k ∈ {6; 7}
 ---
 >   k ∈ {7}
-2547c2541
+2550c2544
 <   k ∈ {7; 8}
 ---
 >   k ∈ {8}
-2623c2617
+2626c2620
 <   k ∈ {8; 9}
 ---
 >   k ∈ {9}
-2701c2695
+2704c2698
 <   k ∈ {9; 10}
 ---
 >   k ∈ {10}
-2781c2775
+2784c2778
 <   k ∈ {10; 11}
 ---
 >   k ∈ {11}
-2863c2857
+2866c2860
 <   k ∈ {11; 12}
 ---
 >   k ∈ {12}
-2944c2938
+2947c2941
 <   k ∈ {12; 13}
 ---
 >   k ∈ {13}
-2990c2984
+2993c2987
 <   k ∈ {12; 13; 14}
 ---
 >   k ∈ {13; 14}
-3035c3029
+3038c3032
 <   k ∈ {12; 13; 14; 15}
 ---
 >   k ∈ {13; 14; 15}
-3080c3074
+3083c3077
 <   k ∈ [12..97]
 ---
 >   k ∈ [13..97]
-3136c3130
+3140c3134
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {1}
-3144c3138
+3148c3142
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {2}
-3152c3146
+3156c3150
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {3}
-3160c3154
+3164c3158
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {4}
-3168c3162
+3172c3166
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {5}
-3176c3170
+3180c3174
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {6}
-3184c3178
+3188c3182
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: {-20; 1; 2; 3; 4; 5; 6; 7}
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {7}
-3192c3186
+3196c3190
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..8]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {8}
-3200c3194
+3204c3198
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..9]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {9}
-3208c3202
+3212c3206
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..10]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {10}
-3216c3210
+3220c3214
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..11]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {11}
-3224c3218
+3228c3222
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..12]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {12}
-3232c3226
+3236c3230
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..13]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {13}
-3240c3234
+3244c3238
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..14]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {14}
-3248c3242
+3252c3246
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..15]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {15}
-3256c3250
+3260c3254
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..16]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {16}
-3264c3258
+3268c3262
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..17]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {17}
-3272c3266
+3276c3270
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..18]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {18}
-3280c3274
+3284c3278
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..19]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {19}
-3288c3282
+3292c3286
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..20]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {20}
-3296c3290
+3300c3294
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..21]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {21}
-3304c3298
+3308c3302
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..22]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {22}
-3312c3306
+3316c3310
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..23]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {23}
-3320c3314
+3324c3318
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..24]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {24}
-3328c3322
+3332c3326
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..25]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {25}
-3336c3330
+3340c3334
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..26]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {26}
-3344c3338
+3348c3342
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..27]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {27}
-3352c3346
+3356c3350
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..28]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {28}
-3360c3354
+3364c3358
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..29]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {29}
-3368c3362
+3372c3366
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..30]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30}
-3377c3371
+3381c3375
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..31]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31}
-3385c3379
+3389c3383
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..32]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: {30; 31; 32}
-3393c3387
+3397c3391
 < [eva] malloc-optimistic.c:122: Frama_C_show_each: [-20..99]
 ---
 > [eva] malloc-optimistic.c:122: Frama_C_show_each: [30..99]
diff --git a/tests/float/oracle/absorb_sav2.res b/tests/float/oracle/absorb_sav2.res
index 50a56ee76dc38c10f095e0520348aa5c9e3de082..12c1f09740ca2976d1a2adc134eb58caebcde304 100644
--- a/tests/float/oracle/absorb_sav2.res
+++ b/tests/float/oracle/absorb_sav2.res
@@ -15,7 +15,7 @@
 [eva] absorb.c:19: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] absorb.c:22: starting to merge loop iterations
+[eva:partition] absorb.c:22: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/float/oracle/some.0.res.oracle b/tests/float/oracle/some.0.res.oracle
index 3d3f8660cc0f227c06ae718b27a7f97855cd67b2..6ebb17d02e91c85ab8ae01908a85005b7b80b66e 100644
--- a/tests/float/oracle/some.0.res.oracle
+++ b/tests/float/oracle/some.0.res.oracle
@@ -6,11 +6,11 @@
   t[0] ∈ {1.0000000000000000}
    [1..54] ∈ {0}
   y ∈ {1.0000000000000000*2^-1}
-[eva] some.c:11: Trace partitioning superposing up to 10 states
-[eva] some.c:11: Trace partitioning superposing up to 20 states
-[eva] some.c:11: Trace partitioning superposing up to 30 states
-[eva] some.c:11: Trace partitioning superposing up to 40 states
-[eva] some.c:11: Trace partitioning superposing up to 50 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 10 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 20 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 30 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 40 states
+[eva:partition] some.c:11: Trace partitioning superposing up to 50 states
 [eva] some.c:16: 
   Frama_C_dump_each:
   # cvalue:
diff --git a/tests/float/oracle/widen.0.res.oracle b/tests/float/oracle/widen.0.res.oracle
index 4bfb9c2b0c702c3941d97dc7a1a5b87b5f8d71e9..05627b3a713246ed80e176f6a42eb7be34d18841 100644
--- a/tests/float/oracle/widen.0.res.oracle
+++ b/tests/float/oracle/widen.0.res.oracle
@@ -6,12 +6,12 @@
   rand ∈ [--..--]
 [eva] computing for function main1 <- main.
   Called from widen.c:50.
-[eva] widen.c:13: starting to merge loop iterations
+[eva:partition] widen.c:13: starting to merge loop iterations
 [eva:alarm] widen.c:14: Warning: 
   non-finite double value. assert \is_finite(\mul_double(max, (double)2.));
-[eva] widen.c:16: starting to merge loop iterations
+[eva:partition] widen.c:16: starting to merge loop iterations
 [eva] widen.c:24: Frama_C_show_each_double_inf: [1. .. 1.79769313486e+308]
-[eva] widen.c:25: starting to merge loop iterations
+[eva:partition] widen.c:25: starting to merge loop iterations
 [eva:alarm] widen.c:27: Warning: 
   non-finite float value. assert \is_finite((float)max);
 [eva] widen.c:34: Frama_C_show_each_float_inf: [1. .. 3.40282346639e+38]
@@ -19,7 +19,7 @@
 [eva] Done for function main1
 [eva] computing for function main2 <- main.
   Called from widen.c:51.
-[eva] widen.c:40: starting to merge loop iterations
+[eva:partition] widen.c:40: starting to merge loop iterations
 [eva] widen.c:45: Frama_C_show_each: [-0. .. 0.]
 [eva] Recording results for main2
 [eva] Done for function main2
diff --git a/tests/float/oracle/widen.1.res.oracle b/tests/float/oracle/widen.1.res.oracle
index 8055bd310fbb250d32fa24fc5b658bd2c0590560..22f4906d858dd3cb36f50d55abf98bf047aa5909 100644
--- a/tests/float/oracle/widen.1.res.oracle
+++ b/tests/float/oracle/widen.1.res.oracle
@@ -6,16 +6,16 @@
   rand ∈ [--..--]
 [eva] computing for function main1 <- main.
   Called from widen.c:50.
-[eva] widen.c:13: starting to merge loop iterations
-[eva] widen.c:16: starting to merge loop iterations
+[eva:partition] widen.c:13: starting to merge loop iterations
+[eva:partition] widen.c:16: starting to merge loop iterations
 [eva] widen.c:24: Frama_C_show_each_double_inf: [1. .. inf]
-[eva] widen.c:25: starting to merge loop iterations
+[eva:partition] widen.c:25: starting to merge loop iterations
 [eva] widen.c:34: Frama_C_show_each_float_inf: [1. .. inf]
 [eva] Recording results for main1
 [eva] Done for function main1
 [eva] computing for function main2 <- main.
   Called from widen.c:51.
-[eva] widen.c:40: starting to merge loop iterations
+[eva:partition] widen.c:40: starting to merge loop iterations
 [eva] widen.c:45: Frama_C_show_each: [-0. .. 0.]
 [eva] Recording results for main2
 [eva] Done for function main2
diff --git a/tests/idct/oracle/ieee_1180_1990.res.oracle b/tests/idct/oracle/ieee_1180_1990.res.oracle
index 2c969383f1f633e2d193897191201c7d3822fe32..de26bca7dee6ebb5ff1620af3f00af92c36b71d9 100644
--- a/tests/idct/oracle/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle/ieee_1180_1990.res.oracle
@@ -14,10 +14,10 @@
   idct_init ∈ {1}
   idct_mc1[0..7][0..7] ∈ {0}
   idct_mc2[0..7][0..7] ∈ {0}
-[eva] ieee_1180_1990.c:179: starting to merge loop iterations
-[eva] ieee_1180_1990.c:178: starting to merge loop iterations
-[eva] ieee_1180_1990.c:185: starting to merge loop iterations
-[eva] ieee_1180_1990.c:184: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:179: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:178: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:185: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:184: starting to merge loop iterations
 [eva] computing for function idct <- main.
   Called from ieee_1180_1990.c:187.
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
@@ -25,7 +25,7 @@
 [eva] idct.c:90: function sqrt: precondition 'arg_positive' got status valid.
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:91: function cos: precondition 'finite_arg' got status valid.
-[eva] idct.c:88: starting to merge loop iterations
+[eva:partition] idct.c:88: starting to merge loop iterations
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
@@ -34,7 +34,7 @@
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
-[eva] idct.c:87: starting to merge loop iterations
+[eva:partition] idct.c:87: starting to merge loop iterations
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
@@ -47,8 +47,8 @@
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
 [eva] idct.c:90: Call to builtin Frama_C_sqrt for function sqrt
 [eva] idct.c:91: Call to builtin Frama_C_cos for function cos
-[eva] idct.c:128: starting to merge loop iterations
-[eva] idct.c:126: starting to merge loop iterations
+[eva:partition] idct.c:128: starting to merge loop iterations
+[eva:partition] idct.c:126: starting to merge loop iterations
 [eva:alarm] idct.c:129: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 [eva:alarm] idct.c:131: Warning: 
@@ -64,12 +64,12 @@
 [eva:alarm] idct.c:150: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 [eva:signed-overflow] idct.c:141: Warning: 2's complement assumed for overflow
-[eva] idct.c:125: starting to merge loop iterations
+[eva:partition] idct.c:125: starting to merge loop iterations
 [eva:signed-overflow] idct.c:163: Warning: 2's complement assumed for overflow
 [eva:alarm] idct.c:163: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp2[k][j]);
-[eva] idct.c:162: starting to merge loop iterations
-[eva] idct.c:160: starting to merge loop iterations
+[eva:partition] idct.c:162: starting to merge loop iterations
+[eva:partition] idct.c:160: starting to merge loop iterations
 [eva:alarm] idct.c:163: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 [eva:alarm] idct.c:166: Warning: 
@@ -85,21 +85,20 @@
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 [eva:alarm] idct.c:185: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-[eva] idct.c:159: starting to merge loop iterations
+[eva:partition] idct.c:159: starting to merge loop iterations
 [eva] Recording results for idct
 [eva] Done for function idct
 [eva:alarm] ieee_1180_1990.c:191: Warning: 
   accessing uninitialized left-value. assert \initialized(&m2[i][j]);
-[eva] ieee_1180_1990.c:190: starting to merge loop iterations
-[eva] ieee_1180_1990.c:189: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:190: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:189: starting to merge loop iterations
 [eva] computing for function printf_va_1 <- main.
   Called from ieee_1180_1990.c:195.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] ieee_1180_1990.c:195: function printf_va_1: precondition got status valid.
 [eva] Done for function printf_va_1
 [eva] computing for function printf_va_2 <- main.
   Called from ieee_1180_1990.c:196.
-[eva] using specification for function printf_va_2
 [eva] ieee_1180_1990.c:196: function printf_va_2: precondition got status valid.
 [eva] Done for function printf_va_2
 [eva] computing for function IEEE_1180_1990_mkbk <- main.
@@ -108,7 +107,7 @@
   Called from ieee_1180_1990.c:85.
 [eva] Recording results for IEEE_1180_1990_rand
 [eva] Done for function IEEE_1180_1990_rand
-[eva] ieee_1180_1990.c:84: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:84: starting to merge loop iterations
 [eva] computing for function IEEE_1180_1990_rand <- IEEE_1180_1990_mkbk <- main.
   Called from ieee_1180_1990.c:85.
 [eva:signed-overflow] ieee_1180_1990.c:69: Warning: 
@@ -135,7 +134,7 @@
   Called from ieee_1180_1990.c:85.
 [eva] Recording results for IEEE_1180_1990_rand
 [eva] Done for function IEEE_1180_1990_rand
-[eva] ieee_1180_1990.c:83: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:83: starting to merge loop iterations
 [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -154,7 +153,7 @@
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:101: 
   function cos: precondition 'finite_arg' got status valid.
-[eva] ieee_1180_1990.c:99: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:99: starting to merge loop iterations
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
@@ -163,7 +162,7 @@
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
-[eva] ieee_1180_1990.c:98: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:98: starting to merge loop iterations
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
@@ -176,15 +175,15 @@
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
-[eva] ieee_1180_1990.c:108: starting to merge loop iterations
-[eva] ieee_1180_1990.c:105: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:108: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:105: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:109: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-[eva] ieee_1180_1990.c:104: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:104: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:116: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][k]);
-[eva] ieee_1180_1990.c:115: starting to merge loop iterations
-[eva] ieee_1180_1990.c:112: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:115: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:112: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:116: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp2[i][j]);
 [eva:alarm] ieee_1180_1990.c:117: Warning: 
@@ -209,7 +208,7 @@
 [eva:alarm] ieee_1180_1990.c:124: Warning: 
   overflow in conversion from floating-point to integer.
   assert tmp2[i][j] - 0.5 < 2147483648;
-[eva] ieee_1180_1990.c:111: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:111: starting to merge loop iterations
 [eva] Recording results for IEEE_1180_1990_dctf
 [eva] Done for function IEEE_1180_1990_dctf
 [eva] computing for function IEEE_1180_1990_idctf <- main.
@@ -222,7 +221,7 @@
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:141: 
   function cos: precondition 'finite_arg' got status valid.
-[eva] ieee_1180_1990.c:139: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:139: starting to merge loop iterations
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
@@ -231,7 +230,7 @@
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
-[eva] ieee_1180_1990.c:138: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:138: starting to merge loop iterations
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
@@ -246,15 +245,15 @@
 [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 [eva:alarm] ieee_1180_1990.c:150: Warning: 
   accessing uninitialized left-value. assert \initialized(&(*(m1 + k))[j]);
-[eva] ieee_1180_1990.c:149: starting to merge loop iterations
-[eva] ieee_1180_1990.c:146: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:149: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:146: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:150: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-[eva] ieee_1180_1990.c:145: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:145: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:157: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp1[i][k]);
-[eva] ieee_1180_1990.c:156: starting to merge loop iterations
-[eva] ieee_1180_1990.c:153: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:156: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:153: starting to merge loop iterations
 [eva:alarm] ieee_1180_1990.c:157: Warning: 
   accessing uninitialized left-value. assert \initialized(&tmp2[i][j]);
 [eva:alarm] ieee_1180_1990.c:158: Warning: 
@@ -279,7 +278,7 @@
 [eva:alarm] ieee_1180_1990.c:165: Warning: 
   overflow in conversion from floating-point to integer.
   assert tmp2[i][j] - 0.5 < 2147483648;
-[eva] ieee_1180_1990.c:152: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:152: starting to merge loop iterations
 [eva] Recording results for IEEE_1180_1990_idctf
 [eva] Done for function IEEE_1180_1990_idctf
 [eva] computing for function idct <- main.
@@ -303,14 +302,14 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:231: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[0].pmse[j][k]);
-[eva] ieee_1180_1990.c:216: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:216: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:231: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:215: starting to merge loop iterations
-[eva] ieee_1180_1990.c:234: starting to merge loop iterations
-[eva] ieee_1180_1990.c:233: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:215: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:234: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:233: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:235: Warning: 
   2's complement assumed for overflow
 [eva] computing for function IEEE_1180_1990_dctf <- main.
@@ -339,12 +338,12 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:255: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[3].pmse[j][k]);
-[eva] ieee_1180_1990.c:240: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:240: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:255: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:239: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:239: starting to merge loop iterations
 [eva] computing for function IEEE_1180_1990_mkbk <- main.
   Called from ieee_1180_1990.c:257.
 [eva] computing for function IEEE_1180_1990_rand <- IEEE_1180_1990_mkbk <- main.
@@ -376,16 +375,16 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:277: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[1].pmse[j][k]);
-[eva] ieee_1180_1990.c:262: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:262: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:277: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:261: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:261: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:281: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:280: starting to merge loop iterations
-[eva] ieee_1180_1990.c:279: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:280: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:279: starting to merge loop iterations
 [eva] ieee_1180_1990.c:282: Reusing old results for call to IEEE_1180_1990_dctf
 [eva] ieee_1180_1990.c:283: Reusing old results for call to IEEE_1180_1990_idctf
 [eva] ieee_1180_1990.c:284: Reusing old results for call to idct
@@ -403,12 +402,12 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:301: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[4].pmse[j][k]);
-[eva] ieee_1180_1990.c:286: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:286: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:301: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:285: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:285: starting to merge loop iterations
 [eva] computing for function IEEE_1180_1990_mkbk <- main.
   Called from ieee_1180_1990.c:303.
 [eva] computing for function IEEE_1180_1990_rand <- IEEE_1180_1990_mkbk <- main.
@@ -440,16 +439,16 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:323: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[2].pmse[j][k]);
-[eva] ieee_1180_1990.c:308: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:308: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:323: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:307: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:307: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:327: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:326: starting to merge loop iterations
-[eva] ieee_1180_1990.c:325: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:326: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:325: starting to merge loop iterations
 [eva] ieee_1180_1990.c:328: Reusing old results for call to IEEE_1180_1990_dctf
 [eva] ieee_1180_1990.c:329: Reusing old results for call to IEEE_1180_1990_idctf
 [eva] ieee_1180_1990.c:330: Reusing old results for call to idct
@@ -467,13 +466,13 @@
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:347: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[5].pmse[j][k]);
-[eva] ieee_1180_1990.c:332: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:332: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
   2's complement assumed for overflow
 [eva:signed-overflow] ieee_1180_1990.c:347: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:331: starting to merge loop iterations
-[eva] ieee_1180_1990.c:202: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:331: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:202: starting to merge loop iterations
 [eva] computing for function IEEE_1180_1990_mkbk <- main.
   Called from ieee_1180_1990.c:211.
 [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -665,7 +664,7 @@
   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
 [eva:signed-overflow] ieee_1180_1990.c:369: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:355: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:355: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:357: Warning: 
   2's complement assumed for overflow
 [eva:alarm] ieee_1180_1990.c:358: Warning: 
@@ -678,10 +677,10 @@
   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
 [eva:alarm] ieee_1180_1990.c:369: Warning: 
   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
-[eva] ieee_1180_1990.c:354: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:354: starting to merge loop iterations
 [eva:signed-overflow] ieee_1180_1990.c:389: Warning: 
   2's complement assumed for overflow
-[eva] ieee_1180_1990.c:350: starting to merge loop iterations
+[eva:partition] ieee_1180_1990.c:350: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [scope:rm_asserts] removing 16 assertion(s)
diff --git a/tests/idct/oracle_apron/ieee_1180_1990.res.oracle b/tests/idct/oracle_apron/ieee_1180_1990.res.oracle
index 1a57722939277823008c11bafad82d98960e1b3c..bac41cbc7ddba330c7a6fc9d6d338a981a22c19b 100644
--- a/tests/idct/oracle_apron/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_apron/ieee_1180_1990.res.oracle
@@ -1,4 +1,4 @@
-139,144c139,162
+138,143c138,161
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -30,7 +30,7 @@
 >   Called from ieee_1180_1990.c:85.
 > [eva] Recording results for IEEE_1180_1990_rand
 > [eva] Done for function IEEE_1180_1990_rand
-354,359c372,395
+353,358c371,394
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -62,7 +62,7 @@
 >   Called from ieee_1180_1990.c:85.
 > [eva] Recording results for IEEE_1180_1990_rand
 > [eva] Done for function IEEE_1180_1990_rand
-362,364c398,409
+361,363c397,408
 < [eva] ieee_1180_1990.c:258: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:259: Reusing old results for call to IEEE_1180_1990_idctf
 < [eva] ieee_1180_1990.c:260: Reusing old results for call to idct
@@ -79,7 +79,7 @@
 >   Called from ieee_1180_1990.c:260.
 > [eva] Recording results for idct
 > [eva] Done for function idct
-389,391c434,445
+388,390c433,444
 < [eva] ieee_1180_1990.c:282: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:283: Reusing old results for call to IEEE_1180_1990_idctf
 < [eva] ieee_1180_1990.c:284: Reusing old results for call to idct
@@ -96,7 +96,7 @@
 >   Called from ieee_1180_1990.c:284.
 > [eva] Recording results for idct
 > [eva] Done for function idct
-418,423c472,495
+417,422c471,494
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -128,7 +128,7 @@
 >   Called from ieee_1180_1990.c:85.
 > [eva] Recording results for IEEE_1180_1990_rand
 > [eva] Done for function IEEE_1180_1990_rand
-426,428c498,509
+425,427c497,508
 < [eva] ieee_1180_1990.c:304: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:305: Reusing old results for call to IEEE_1180_1990_idctf
 < [eva] ieee_1180_1990.c:306: Reusing old results for call to idct
@@ -145,7 +145,7 @@
 >   Called from ieee_1180_1990.c:306.
 > [eva] Recording results for idct
 > [eva] Done for function idct
-453,455c534,545
+452,454c533,544
 < [eva] ieee_1180_1990.c:328: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:329: Reusing old results for call to IEEE_1180_1990_idctf
 < [eva] ieee_1180_1990.c:330: Reusing old results for call to idct
@@ -162,7 +162,7 @@
 >   Called from ieee_1180_1990.c:330.
 > [eva] Recording results for idct
 > [eva] Done for function idct
-479,485c569,1736
+478,484c568,1735
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 < [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
@@ -1339,7 +1339,7 @@
 >   Called from ieee_1180_1990.c:85.
 > [eva] Recording results for IEEE_1180_1990_rand
 > [eva] Done for function IEEE_1180_1990_rand
-518,661c1769,1896
+517,660c1768,1895
 < [eva] ieee_1180_1990.c:214: Reusing old results for call to idct
 < [eva] ieee_1180_1990.c:236: Reusing old results for call to IEEE_1180_1990_dctf
 < [eva] ieee_1180_1990.c:237: Reusing old results for call to IEEE_1180_1990_idctf
diff --git a/tests/idct/oracle_equality/ieee_1180_1990.res.oracle b/tests/idct/oracle_equality/ieee_1180_1990.res.oracle
index 12ecac9ae6750f82c8cf5c0e4bbffb30add61432..78b0c4d7fffa9a37219ed767c94f6a190f4565ae 100644
--- a/tests/idct/oracle_equality/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_equality/ieee_1180_1990.res.oracle
@@ -1,79 +1,79 @@
-297a298,299
+296a297,298
 > [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
 >   2's complement assumed for overflow
-301a304,305
+300a303,304
 > [eva:signed-overflow] ieee_1180_1990.c:220: Warning: 
 >   2's complement assumed for overflow
-307,308d310
+306,307d309
 < [eva:signed-overflow] ieee_1180_1990.c:219: Warning: 
 <   2's complement assumed for overflow
-333a336,337
+332a335,336
 > [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
 >   2's complement assumed for overflow
-337a342,343
+336a341,342
 > [eva:signed-overflow] ieee_1180_1990.c:244: Warning: 
 >   2's complement assumed for overflow
-343,344d348
+342,343d347
 < [eva:signed-overflow] ieee_1180_1990.c:243: Warning: 
 <   2's complement assumed for overflow
-359a364,367
+358a363,366
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-370a379,380
+369a378,379
 > [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
 >   2's complement assumed for overflow
-374a385,386
+373a384,385
 > [eva:signed-overflow] ieee_1180_1990.c:266: Warning: 
 >   2's complement assumed for overflow
-380,381d391
+379,380d390
 < [eva:signed-overflow] ieee_1180_1990.c:265: Warning: 
 <   2's complement assumed for overflow
-397a408,409
+396a407,408
 > [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
 >   2's complement assumed for overflow
-401a414,415
+400a413,414
 > [eva:signed-overflow] ieee_1180_1990.c:290: Warning: 
 >   2's complement assumed for overflow
-407,408d420
+406,407d419
 < [eva:signed-overflow] ieee_1180_1990.c:289: Warning: 
 <   2's complement assumed for overflow
-423a436,439
+422a435,438
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-434a451,452
+433a450,451
 > [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
 >   2's complement assumed for overflow
-438a457,458
+437a456,457
 > [eva:signed-overflow] ieee_1180_1990.c:312: Warning: 
 >   2's complement assumed for overflow
-444,445d463
+443,444d462
 < [eva:signed-overflow] ieee_1180_1990.c:311: Warning: 
 <   2's complement assumed for overflow
-461a480,481
+460a479,480
 > [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
 >   2's complement assumed for overflow
-465a486,487
+464a485,486
 > [eva:signed-overflow] ieee_1180_1990.c:336: Warning: 
 >   2's complement assumed for overflow
-471,472d492
+470,471d491
 < [eva:signed-overflow] ieee_1180_1990.c:335: Warning: 
 <   2's complement assumed for overflow
-485a506,509
+484a505,508
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-491a516
+490a515
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-492a518,520
+491a517,519
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-493a522,528
+492a521,527
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
@@ -81,11 +81,11 @@
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-506a542
+505a541
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-507a544
+506a543
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-508a546,554
+507a545,553
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
@@ -95,7 +95,7 @@
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-770c816
+769c815
 <     by the Eva analyzer:      0 errors   42 warnings
 ---
 >     by the Eva analyzer:      0 errors   48 warnings
diff --git a/tests/idct/oracle_gauges/ieee_1180_1990.res.oracle b/tests/idct/oracle_gauges/ieee_1180_1990.res.oracle
index fb60196772f9a3ee9057b06569d83b280ad8a4c3..99a37fe5a9ec9d3a991235b7167c28310c523a49 100644
--- a/tests/idct/oracle_gauges/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_gauges/ieee_1180_1990.res.oracle
@@ -1,4 +1,4 @@
-491a492
+490a491
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-506a508
+505a507
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
diff --git a/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle b/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle
index 657b6a08704d538766953e110db86ca2784761a7..f5d41308dd5b0c7c808f1de7b5e0347265945fdc 100644
--- a/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_multidim/ieee_1180_1990.res.oracle
@@ -32,21 +32,20 @@
 <   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
 < [eva:alarm] idct.c:185: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-95,104d63
+95,103d63
 < [eva] computing for function printf_va_1 <- main.
 <   Called from ieee_1180_1990.c:195.
-< [eva] using specification for function printf_va_1
+< [eva] using specification for function printf
 < [eva] ieee_1180_1990.c:195: function printf_va_1: precondition got status valid.
 < [eva] Done for function printf_va_1
 < [eva] computing for function printf_va_2 <- main.
 <   Called from ieee_1180_1990.c:196.
-< [eva] using specification for function printf_va_2
 < [eva] ieee_1180_1990.c:196: function printf_va_2: precondition got status valid.
 < [eva] Done for function printf_va_2
-181,182d139
+180,181d139
 < [eva:alarm] ieee_1180_1990.c:109: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-188,211d144
+187,210d144
 < [eva:alarm] ieee_1180_1990.c:116: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp2[i][j]);
 < [eva:alarm] ieee_1180_1990.c:117: Warning: 
@@ -71,10 +70,10 @@
 < [eva:alarm] ieee_1180_1990.c:124: Warning: 
 <   overflow in conversion from floating-point to integer.
 <   assert tmp2[i][j] - 0.5 < 2147483648;
-251,252d183
+250,251d183
 < [eva:alarm] ieee_1180_1990.c:150: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp1[i][j]);
-258,281d188
+257,280d188
 < [eva:alarm] ieee_1180_1990.c:157: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&tmp2[i][j]);
 < [eva:alarm] ieee_1180_1990.c:158: Warning: 
@@ -99,104 +98,104 @@
 < [eva:alarm] ieee_1180_1990.c:165: Warning: 
 <   overflow in conversion from floating-point to integer.
 <   assert tmp2[i][j] - 0.5 < 2147483648;
-287d193
+286d193
 < [eva:signed-overflow] idct.c:129: Warning: 2's complement assumed for overflow
-289a196,197
+288a196,197
 > [eva:signed-overflow] idct.c:129: Warning: 2's complement assumed for overflow
 > [eva:signed-overflow] idct.c:163: Warning: 2's complement assumed for overflow
-292,293d199
+291,292d199
 < [eva:signed-overflow] ieee_1180_1990.c:218: Warning: 
 <   2's complement assumed for overflow
-300,303d205
+299,302d205
 < [eva:signed-overflow] ieee_1180_1990.c:220: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:230: Warning: 
 <   2's complement assumed for overflow
-314,315d215
+313,314d215
 < [eva:signed-overflow] ieee_1180_1990.c:235: Warning: 
 <   2's complement assumed for overflow
-328,329d227
+327,328d227
 < [eva:signed-overflow] ieee_1180_1990.c:242: Warning: 
 <   2's complement assumed for overflow
-336,339d233
+335,338d233
 < [eva:signed-overflow] ieee_1180_1990.c:244: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:254: Warning: 
 <   2's complement assumed for overflow
-365,366d258
+364,365d258
 < [eva:signed-overflow] ieee_1180_1990.c:264: Warning: 
 <   2's complement assumed for overflow
-373,376d264
+372,375d264
 < [eva:signed-overflow] ieee_1180_1990.c:266: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:276: Warning: 
 <   2's complement assumed for overflow
-385,386d272
+384,385d272
 < [eva:signed-overflow] ieee_1180_1990.c:281: Warning: 
 <   2's complement assumed for overflow
-392,393d277
+391,392d277
 < [eva:signed-overflow] ieee_1180_1990.c:288: Warning: 
 <   2's complement assumed for overflow
-400,403d283
+399,402d283
 < [eva:signed-overflow] ieee_1180_1990.c:290: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:300: Warning: 
 <   2's complement assumed for overflow
-429,430d308
+428,429d308
 < [eva:signed-overflow] ieee_1180_1990.c:310: Warning: 
 <   2's complement assumed for overflow
-437,440d314
+436,439d314
 < [eva:signed-overflow] ieee_1180_1990.c:312: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:322: Warning: 
 <   2's complement assumed for overflow
-449,450d322
+448,449d322
 < [eva:signed-overflow] ieee_1180_1990.c:327: Warning: 
 <   2's complement assumed for overflow
-456,457d327
+455,456d327
 < [eva:signed-overflow] ieee_1180_1990.c:334: Warning: 
 <   2's complement assumed for overflow
-464,467d333
+463,466d333
 < [eva:signed-overflow] ieee_1180_1990.c:336: Warning: 
 <   2's complement assumed for overflow
 < [eva:signed-overflow] ieee_1180_1990.c:346: Warning: 
 <   2's complement assumed for overflow
-671,672d536
+670,671d536
 < [eva:alarm] ieee_1180_1990.c:358: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&res[i].pmse[j][k]);
-675,680d538
+674,679d538
 < [eva:alarm] ieee_1180_1990.c:369: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
 < [eva:alarm] ieee_1180_1990.c:369: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
 < [eva:alarm] ieee_1180_1990.c:369: Warning: 
 <   accessing uninitialized left-value. assert \initialized(&res[i].pme[j][k]);
-687d544
+686d544
 < [scope:rm_asserts] removing 16 assertion(s)
-698c555,556
+697c555,556
 <   M1[0..7][0..7] ∈ [--..--]
 ---
 >   M1[0][0..7] ∈ [-2147483647..2147483647]
 >     [1..7][0..7] ∈ [--..--]
-708c566
+707c566
 <   m2[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 ---
 >   m2[0..7][0..7] ∈ [-2048..2047] or UNINITIALIZED
-720c578
+719c578
 <   m3[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 ---
 >   m3[0..7][0..7] ∈ [-256..255] or UNINITIALIZED
-725,726c583,584
+724,725c583,584
 <   m2[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 <   m4[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 ---
 >   m2[0..7][0..7] ∈ [-2048..2047] or UNINITIALIZED
 >   m4[0..7][0..7] ∈ [-256..255] or UNINITIALIZED
-731c589
+730c589
 <   tmp2[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 ---
 >   tmp2[0..7][0..7] ∈ [-8192..8191] or UNINITIALIZED
-744,746c602,604
+743,745c602,604
 <   m2[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 <   m3[0..7][0..7] ∈ [--..--] or UNINITIALIZED
 <   m4[0..7][0..7] ∈ [--..--] or UNINITIALIZED
@@ -204,40 +203,40 @@
 >   m2[0..7][0..7] ∈ [-2048..2047] or UNINITIALIZED
 >   m3[0..7][0..7] ∈ [-256..255] or UNINITIALIZED
 >   m4[0..7][0..7] ∈ [-256..255] or UNINITIALIZED
-750,751c608,610
+749,750c608,610
 <   err ∈ [--..--] or UNINITIALIZED
 <   M1[0..7][0..7] ∈ [--..--]
 ---
 >   err ∈ [-261121..261121] or UNINITIALIZED
 >   M1[0][0..7] ∈ [-2147483647..2147483647]
 >     [1..7][0..7] ∈ [--..--]
-763d621
+762d621
 <   S___fc_stdout[0..1] ∈ [--..--]
-767c625
+766c625
 <   In these functions, 588 statements reached (out of 626): 93% coverage.
 ---
 >   In these functions, 585 statements reached (out of 626): 93% coverage.
-770c628
+769c628
 <     by the Eva analyzer:      0 errors   42 warnings
 ---
 >     by the Eva analyzer:      0 errors   19 warnings
-773,775c631,632
+772,774c631,632
 <   72 alarms generated by the analysis:
 <       64 accesses to uninitialized left-values
 <        8 illegal conversions from floating-point to integer
 ---
 >   32 alarms generated by the analysis:
 >       32 accesses to uninitialized left-values
-779c636
+778c636
 <     Preconditions    11 valid     0 unknown     0 invalid     11 total
 ---
 >     Preconditions     9 valid     0 unknown     0 invalid      9 total
-797,800d653
+796,799d653
 < [from] Computing for function printf_va_1 <-main
 < [from] Done for function printf_va_1
 < [from] Computing for function printf_va_2 <-main
 < [from] Done for function printf_va_2
-813,822d665
+812,821d665
 < [from] Function printf_va_1:
 <   S___fc_stdout[0].__fc_FILE_data
 <                FROM S___fc_stdout[0];
@@ -248,24 +247,24 @@
 <   S___fc_stdout[0].__fc_FILE_data
 <                FROM S___fc_stdout[0]; "output.\n"[bits 0 to 71] (and SELF)
 <   \result FROM S___fc_stdout[0]; "output.\n"[bits 0 to 71]
-856,860d698
+855,859d698
 <   S___fc_stdout[0].__fc_FILE_data
 <                FROM M1[0..7][0..7]; idct_init; idct_mc1[0..7][0..7];
 <                     idct_mc2[0..7][0..7]; S___fc_stdout[0];
 <                     "For all-zero input, the proposed IDCT shall generate all-zero "[bits 0 to 503];
 <                      "output.\n"[bits 0 to 71] (and SELF)
-903,904c741
+902,903c741
 <     idct_init; idct_mc1[0..7][0..7]; idct_mc2[0..7][0..7]; __retres;
 <     S___fc_stdout[0].__fc_FILE_data
 ---
 >     idct_init; idct_mc1[0..7][0..7]; idct_mc2[0..7][0..7]; __retres
-909,911c746
+908,910c746
 <     idct_init; idct_mc1[0..7][0..7]; idct_mc2[0..7][0..7]; S___fc_stdout[0];
 <     "For all-zero input, the proposed IDCT shall generate all-zero "[bits 0 to 503];
 <      "output.\n"[bits 0 to 71]
 ---
 >     idct_init; idct_mc1[0..7][0..7]; idct_mc2[0..7][0..7]
-4026,4048d3860
+4025,4047d3860
 < [    -    ] Assertion 'Eva,initialization' (file idct.c, line 129)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
@@ -289,7 +288,7 @@
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             By RedundantAlarms, with pending:
 <              - Assertion 'Eva,initialization' (file idct.c, line 145)
-4052,4074d3863
+4051,4073d3863
 < [    -    ] Assertion 'Eva,initialization' (file idct.c, line 163)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
@@ -313,11 +312,11 @@
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             By RedundantAlarms, with pending:
 <              - Assertion 'Eva,initialization' (file idct.c, line 180)
-4096,4098d3884
+4095,4097d3884
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 109)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
-4102,4135d3887
+4101,4134d3887
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 116)
 <             assert Eva: initialization: \initialized(&tmp2[i][j]);
 <             tried with Eva.
@@ -352,11 +351,11 @@
 < [    -    ] Assertion 'Eva,float_to_int' (file ieee_1180_1990.c, line 124)
 <             assert Eva: float_to_int: tmp2[i][j] - 0.5 < 2147483648;
 <             tried with Eva.
-4156,4158d3907
+4155,4157d3907
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 150)
 <             assert Eva: initialization: \initialized(&tmp1[i][j]);
 <             tried with Eva.
-4162,4195d3910
+4161,4194d3910
 < [    -    ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 157)
 <             assert Eva: initialization: \initialized(&tmp2[i][j]);
 <             tried with Eva.
@@ -391,7 +390,7 @@
 < [    -    ] Assertion 'Eva,float_to_int' (file ieee_1180_1990.c, line 165)
 <             assert Eva: float_to_int: tmp2[i][j] - 0.5 < 2147483648;
 <             tried with Eva.
-4295,4311c4010,4016
+4294,4310c4010,4016
 < [ Partial ] Assertion 'Eva,initialization' (file ieee_1180_1990.c, line 358)
 <             assert Eva: initialization: \initialized(&res[i].pmse[j][k]);
 <             By RedundantAlarms, with pending:
@@ -417,7 +416,7 @@
 >             reachability of stmt line 196 in main
 >             by Eva.
 > [  Dead   ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_1' (file ieee_1180_1990.c, line 195)
-4315,4316c4020,4023
+4314,4315c4020,4023
 <             by Eva.
 < [  Valid  ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
 ---
@@ -425,18 +424,18 @@
 >             By Eva because:
 >              - Unreachable call 'printf_va_1' (file ieee_1180_1990.c, line 195)
 > [  Dead   ] Instance of 'Pre-condition (file FRAMAC_SHARE/libc/stdio.h, line 248)' at call 'printf_va_2' (file ieee_1180_1990.c, line 196)
-4320c4027,4029
+4319c4027,4029
 <             by Eva.
 ---
 >             Locally valid, but unreachable.
 >             By Eva because:
 >              - Unreachable call 'printf_va_2' (file ieee_1180_1990.c, line 196)
-4377,4378c4086
+4376,4377c4086
 <    199 Completely validated
 <     16 Locally validated
 ---
 >    197 Completely validated
-4380,4381c4088,4091
+4379,4380c4088,4091
 <     56 To be validated
 <    863 Total
 ---
diff --git a/tests/idct/oracle_octagon/ieee_1180_1990.res.oracle b/tests/idct/oracle_octagon/ieee_1180_1990.res.oracle
index fdf9672406b32d78b97f08ad270bfd3a546e9682..36947f2da78dd9222563bb2dbd6f6c61abf190e2 100644
--- a/tests/idct/oracle_octagon/ieee_1180_1990.res.oracle
+++ b/tests/idct/oracle_octagon/ieee_1180_1990.res.oracle
@@ -1,19 +1,19 @@
-359a360,363
+358a359,362
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-423a428,431
+422a427,430
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-485a494,497
+484a493,496
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
 > [eva] ieee_1180_1990.c:85: Reusing old results for call to IEEE_1180_1990_rand
-491a504,510
+490a503,509
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
@@ -21,17 +21,17 @@
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-492a512
+491a511
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-493a514,516
+492a513,515
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:101: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:100: Call to builtin Frama_C_sqrt for function sqrt
-506a530
+505a529
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-507a532
+506a531
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
-508a534,542
+507a533,541
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
 > [eva] ieee_1180_1990.c:141: Call to builtin Frama_C_cos for function cos
 > [eva] ieee_1180_1990.c:140: Call to builtin Frama_C_sqrt for function sqrt
diff --git a/tests/impact/oracle/initial.res.oracle b/tests/impact/oracle/initial.res.oracle
index ec4c480ee0b41dba8e585160d8dd49bc31f2279d..8decf5f89df5b8433a2bd4648c9963274a710d5b 100644
--- a/tests/impact/oracle/initial.res.oracle
+++ b/tests/impact/oracle/initial.res.oracle
@@ -18,7 +18,7 @@
 [eva] Done for function f1
 [eva] Recording results for g1
 [eva] Done for function g1
-[eva] initial.i:24: starting to merge loop iterations
+[eva:partition] initial.i:24: starting to merge loop iterations
 [eva] computing for function g1 <- main1.
   Called from initial.i:25.
 [eva] initial.i:19: Reusing old results for call to f1
@@ -96,7 +96,7 @@
 [eva] Done for function f3
 [eva] Recording results for g3
 [eva] Done for function g3
-[eva] initial.i:80: starting to merge loop iterations
+[eva:partition] initial.i:80: starting to merge loop iterations
 [eva] initial.i:81: Reusing old results for call to g3
 [eva] Recording results for main3
 [eva] Done for function main3
diff --git a/tests/impact/oracle/loop2.res.oracle b/tests/impact/oracle/loop2.res.oracle
index 081db859e86a34c34fa26e90f83aebbe750e5f38..8bc235d91f79318bf22c0e51aa7b8220d77be4c9 100644
--- a/tests/impact/oracle/loop2.res.oracle
+++ b/tests/impact/oracle/loop2.res.oracle
@@ -9,7 +9,7 @@
   w[0..9] ∈ [--..--]
 [eva] computing for function init <- main.
   Called from loop2.i:24.
-[eva] loop2.i:11: starting to merge loop iterations
+[eva:partition] loop2.i:11: starting to merge loop iterations
 [eva] Recording results for init
 [from] Computing for function init
 [from] Done for function init
@@ -20,7 +20,7 @@
 [from] Computing for function f
 [from] Done for function f
 [eva] Done for function f
-[eva] loop2.i:25: starting to merge loop iterations
+[eva:partition] loop2.i:25: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from loop2.i:27.
 [eva] Recording results for f
diff --git a/tests/libc/oracle/alloca_h.res.oracle b/tests/libc/oracle/alloca_h.res.oracle
index 53701c99c8185b03f993ee6d1fa783f4e6e4beb8..fa165e7379ac4804e99b56b3237e763e75a781f1 100644
--- a/tests/libc/oracle/alloca_h.res.oracle
+++ b/tests/libc/oracle/alloca_h.res.oracle
@@ -5,17 +5,17 @@
 [eva:initial-state] Values of globals at initialization
   nondet ∈ [--..--]
 [eva] alloca_h.c:30: Call to builtin alloca
-[eva] alloca_h.c:30: allocating variable __alloca_main_l30
+[eva:malloc:new] alloca_h.c:30: allocating variable __alloca_main_l30
 [eva] alloca_h.c:31: assertion got status valid.
 [eva] alloca_h.c:35: Call to builtin alloca
-[eva] alloca_h.c:35: allocating variable __alloca_main_l35
+[eva:malloc:new] alloca_h.c:35: allocating variable __alloca_main_l35
 [eva] alloca_h.c:40: assertion got status valid.
 [eva] computing for function f <- main.
   Called from alloca_h.c:41.
 [eva] alloca_h.c:6: Call to builtin alloca
-[eva] alloca_h.c:6: allocating variable __alloca_f_l6
+[eva:malloc:new] alloca_h.c:6: allocating variable __alloca_f_l6
 [eva] alloca_h.c:7: Call to builtin malloc
-[eva] alloca_h.c:7: allocating variable __malloc_f_l7
+[eva:malloc:new] alloca_h.c:7: allocating variable __malloc_f_l7
 [eva] alloca_h.c:9: Call to builtin free
 [eva:alarm] alloca_h.c:9: Warning: 
   function free: precondition 'freeable' got status unknown.
@@ -24,30 +24,33 @@
   assert ¬\dangling(&p);
 [eva] Recording results for f
 [eva] Done for function f
-[eva] alloca_h.c:41: freeing automatic bases: {__alloca_f_l6}
+[eva:malloc:automatic-free] alloca_h.c:41: 
+  freeing automatic bases: {__alloca_f_l6}
 [eva] alloca_h.c:42: assertion got status valid.
 [eva] computing for function loop <- main.
   Called from alloca_h.c:43.
 [eva] alloca_h.c:23: Call to builtin alloca
-[eva] alloca_h.c:23: allocating variable __alloca_loop_l23
-[eva] alloca_h.c:22: starting to merge loop iterations
+[eva:malloc:new] alloca_h.c:23: allocating variable __alloca_loop_l23
+[eva:partition] alloca_h.c:22: starting to merge loop iterations
 [eva] alloca_h.c:23: Call to builtin alloca
 [eva] alloca_h.c:23: Call to builtin alloca
 [eva] alloca_h.c:23: Call to builtin alloca
 [eva] alloca_h.c:23: Call to builtin alloca
 [eva] Recording results for loop
 [eva] Done for function loop
-[eva] alloca_h.c:43: freeing automatic bases: {__alloca_w_loop_l23}
+[eva:malloc:automatic-free] alloca_h.c:43: 
+  freeing automatic bases: {__alloca_w_loop_l23}
 [eva:alarm] alloca_h.c:44: Warning: assertion got status unknown.
 [eva] alloca_h.c:45: Call to builtin alloca
-[eva] alloca_h.c:45: allocating variable __alloca_main_l45
+[eva:malloc:new] alloca_h.c:45: allocating variable __alloca_main_l45
 [eva] computing for function f2 <- main.
   Called from alloca_h.c:46.
 [eva] alloca_h.c:16: Call to builtin alloca
-[eva] alloca_h.c:16: allocating variable __alloca_f2_l16
+[eva:malloc:new] alloca_h.c:16: allocating variable __alloca_f2_l16
 [eva] Recording results for f2
 [eva] Done for function f2
-[eva] alloca_h.c:46: freeing automatic bases: {__alloca_f2_l16}
+[eva:malloc:automatic-free] alloca_h.c:46: 
+  freeing automatic bases: {__alloca_f2_l16}
 [eva] alloca_h.c:48: assertion got status valid.
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/libc/oracle/argz_c.res.oracle b/tests/libc/oracle/argz_c.res.oracle
index ddbc94e0adf16e5235494757d29316f44e50a102..422ded4c991dfeee52d815f1d5ae53ff17000b62 100644
--- a/tests/libc/oracle/argz_c.res.oracle
+++ b/tests/libc/oracle/argz_c.res.oracle
@@ -75,7 +75,7 @@
 [eva] FRAMAC_SHARE/libc/argz.c:246: Call to builtin strlen
 [eva] FRAMAC_SHARE/libc/argz.c:246: Call to builtin strlen
 [eva] FRAMAC_SHARE/libc/argz.c:251: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/argz.c:251: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:251: 
   allocating variable __malloc_argz_create_l251
 [eva] computing for function stpcpy <- argz_create <- main.
   Called from FRAMAC_SHARE/libc/argz.c:256.
@@ -100,7 +100,7 @@
 [eva] FRAMAC_SHARE/libc/argz.c:202: 
   function strlen: precondition 'valid_string_s' got status valid.
 [eva] FRAMAC_SHARE/libc/argz.c:208: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/argz.c:208: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:208: 
   allocating variable __malloc_argz_create_sep_l208
 [eva] Recording results for argz_create_sep
 [eva] Done for function argz_create_sep
@@ -134,7 +134,7 @@
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
 [eva] FRAMAC_SHARE/libc/argz.c:277: 
   function realloc: precondition 'freeable' got status valid.
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] FRAMAC_SHARE/libc/argz.c:279: 
@@ -162,7 +162,7 @@
 [eva] FRAMAC_SHARE/libc/argz.c:299: Call to builtin realloc
 [eva] FRAMAC_SHARE/libc/argz.c:299: 
   function realloc: precondition 'freeable' got status valid.
-[eva] FRAMAC_SHARE/libc/argz.c:299: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:299: 
   allocating variable __realloc_argz_add_sep_l299
 [eva] Recording results for argz_add_sep
 [eva] Done for function argz_add_sep
@@ -189,7 +189,7 @@
 [eva] computing for function argz_append <- main.
   Called from argz_c.c:38.
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277_0
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] Recording results for argz_append
@@ -205,7 +205,7 @@
 [eva] computing for function argz_append <- argz_add <- main.
   Called from FRAMAC_SHARE/libc/argz.c:288.
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277_1
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] Recording results for argz_append
@@ -268,7 +268,8 @@
   Called from FRAMAC_SHARE/libc/argz.c:85.
 [eva:loop-unroll:auto] FRAMAC_SHARE/libc/string.c:347: Automatic loop unrolling.
 [eva] FRAMAC_SHARE/libc/string.c:350: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/string.c:350: allocating variable __malloc_strndup_l350
+[eva:malloc:new] FRAMAC_SHARE/libc/string.c:350: 
+  allocating variable __malloc_strndup_l350
 [eva] FRAMAC_SHARE/libc/string.c:355: Call to builtin memcpy
 [eva] FRAMAC_SHARE/libc/string.c:355: 
   function memcpy: precondition 'valid_dest' got status valid.
@@ -283,7 +284,8 @@
 [eva] FRAMAC_SHARE/libc/argz.c:55: Call to builtin realloc
 [eva] FRAMAC_SHARE/libc/argz.c:55: 
   function realloc: precondition 'freeable' got status valid.
-[eva] FRAMAC_SHARE/libc/argz.c:55: allocating variable __realloc_str_append_l55
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:55: 
+  allocating variable __realloc_str_append_l55
 [eva] computing for function mempcpy <- str_append <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:58.
 [eva:loop-unroll:auto] FRAMAC_SHARE/libc/string.c:54: Automatic loop unrolling.
@@ -304,7 +306,7 @@
 [eva] computing for function str_append <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:95.
 [eva] FRAMAC_SHARE/libc/argz.c:55: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:55: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:55: 
   allocating variable __realloc_str_append_l55_0
 [eva] computing for function mempcpy <- str_append <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:58.
@@ -316,7 +318,7 @@
 [eva] computing for function argz_append <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:104.
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277_2
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] Recording results for argz_append
@@ -327,7 +329,7 @@
 [eva] computing for function argz_append <- argz_add <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:288.
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277_3
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] Recording results for argz_append
@@ -354,7 +356,7 @@
 [eva] computing for function argz_append <- argz_add <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:288.
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277_4
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] Recording results for argz_append
@@ -376,7 +378,7 @@
 [eva] computing for function argz_append <- argz_add <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:288.
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277_5
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] Recording results for argz_append
@@ -398,7 +400,7 @@
 [eva] computing for function argz_append <- argz_add <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:288.
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277_6
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] Recording results for argz_append
@@ -417,7 +419,7 @@
 [eva] computing for function strndup <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:85.
 [eva] FRAMAC_SHARE/libc/string.c:350: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/string.c:350: 
+[eva:malloc:new] FRAMAC_SHARE/libc/string.c:350: 
   allocating variable __malloc_strndup_l350_0
 [eva] FRAMAC_SHARE/libc/string.c:355: Call to builtin memcpy
 [eva] Recording results for strndup
@@ -425,7 +427,7 @@
 [eva] computing for function str_append <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:88.
 [eva] FRAMAC_SHARE/libc/argz.c:55: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:55: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:55: 
   allocating variable __realloc_str_append_l55_1
 [eva] computing for function mempcpy <- str_append <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:58.
@@ -442,7 +444,7 @@
 [eva] computing for function str_append <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:95.
 [eva] FRAMAC_SHARE/libc/argz.c:55: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:55: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:55: 
   allocating variable __realloc_str_append_l55_2
 [eva] computing for function mempcpy <- str_append <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:58.
@@ -457,7 +459,7 @@
 [eva] computing for function argz_append <- argz_add <- argz_replace <- main.
   Called from FRAMAC_SHARE/libc/argz.c:288.
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277_7
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] Recording results for argz_append
@@ -569,7 +571,7 @@
 [eva] FRAMAC_SHARE/libc/argz.c:163: Call to builtin realloc
 [eva] FRAMAC_SHARE/libc/argz.c:163: 
   function realloc: precondition 'freeable' got status valid.
-[eva] FRAMAC_SHARE/libc/argz.c:163: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:163: 
   allocating variable __realloc_argz_insert_l163
 [eva] FRAMAC_SHARE/libc/argz.c:167: Call to builtin memmove
 [eva] FRAMAC_SHARE/libc/argz.c:167: 
@@ -596,7 +598,7 @@
 [eva] computing for function argz_append <- argz_add <- argz_insert <- main.
   Called from FRAMAC_SHARE/libc/argz.c:288.
 [eva] FRAMAC_SHARE/libc/argz.c:277: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/argz.c:277: 
+[eva:malloc:new] FRAMAC_SHARE/libc/argz.c:277: 
   allocating variable __realloc_argz_append_l277_8
 [eva] FRAMAC_SHARE/libc/argz.c:279: Call to builtin memcpy
 [eva] Recording results for argz_append
diff --git a/tests/libc/oracle/glob_c.res.oracle b/tests/libc/oracle/glob_c.res.oracle
index 91eb904a9baf476445479b6c2d72105531fda702..e4dd2ab757f0588eb82fa23cd1c51d97d89df61f 100644
--- a/tests/libc/oracle/glob_c.res.oracle
+++ b/tests/libc/oracle/glob_c.res.oracle
@@ -15,9 +15,10 @@
 [eva] FRAMAC_SHARE/libc/glob.c:66: Call to builtin realloc
 [eva] FRAMAC_SHARE/libc/glob.c:66: 
   function realloc: precondition 'freeable' got status valid.
-[eva] FRAMAC_SHARE/libc/glob.c:66: allocating variable __realloc_glob_l66
-[eva] FRAMAC_SHARE/libc/glob.c:71: starting to merge loop iterations
-[eva] FRAMAC_SHARE/libc/glob.c:73: starting to merge loop iterations
+[eva:malloc:new] FRAMAC_SHARE/libc/glob.c:66: 
+  allocating variable __realloc_glob_l66
+[eva:partition] FRAMAC_SHARE/libc/glob.c:71: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/glob.c:73: starting to merge loop iterations
 [eva:alarm] FRAMAC_SHARE/libc/glob.c:74: Warning: 
   out of bounds write.
   assert
@@ -60,7 +61,8 @@
   Called from FRAMAC_SHARE/libc/glob.c:32.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/glob.c:66: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/glob.c:66: allocating variable __realloc_glob_l66_0
+[eva:malloc:new] FRAMAC_SHARE/libc/glob.c:66: 
+  allocating variable __realloc_glob_l66_0
 [eva] computing for function Frama_C_nondet <- glob <- main.
   Called from FRAMAC_SHARE/libc/glob.c:77.
 [eva] Done for function Frama_C_nondet
@@ -89,9 +91,11 @@
 [eva] FRAMAC_SHARE/libc/glob.c:50: Call to builtin realloc
 [eva] FRAMAC_SHARE/libc/glob.c:50: 
   function realloc: precondition 'freeable' got status valid.
-[eva] FRAMAC_SHARE/libc/glob.c:50: allocating variable __realloc_glob_l50
+[eva:malloc:new] FRAMAC_SHARE/libc/glob.c:50: 
+  allocating variable __realloc_glob_l50
 [eva] FRAMAC_SHARE/libc/glob.c:66: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/glob.c:66: allocating variable __realloc_glob_l66_1
+[eva:malloc:new] FRAMAC_SHARE/libc/glob.c:66: 
+  allocating variable __realloc_glob_l66_1
 [eva] computing for function Frama_C_nondet <- glob <- main.
   Called from FRAMAC_SHARE/libc/glob.c:77.
 [eva] Done for function Frama_C_nondet
@@ -118,10 +122,12 @@
   Called from FRAMAC_SHARE/libc/glob.c:32.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/glob.c:50: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/glob.c:50: allocating variable __realloc_glob_l50_0
-[eva] FRAMAC_SHARE/libc/glob.c:54: starting to merge loop iterations
+[eva:malloc:new] FRAMAC_SHARE/libc/glob.c:50: 
+  allocating variable __realloc_glob_l50_0
+[eva:partition] FRAMAC_SHARE/libc/glob.c:54: starting to merge loop iterations
 [eva] FRAMAC_SHARE/libc/glob.c:66: Call to builtin realloc
-[eva] FRAMAC_SHARE/libc/glob.c:66: allocating variable __realloc_glob_l66_2
+[eva:malloc:new] FRAMAC_SHARE/libc/glob.c:66: 
+  allocating variable __realloc_glob_l66_2
 [eva] computing for function Frama_C_nondet <- glob <- main.
   Called from FRAMAC_SHARE/libc/glob.c:77.
 [eva] Done for function Frama_C_nondet
diff --git a/tests/libc/oracle/netdb_c.res.oracle b/tests/libc/oracle/netdb_c.res.oracle
index 3b7297530940923f030f125f1b53fad9f737fc29..d974034b41b4c411786e15170ba4c01e1ee5970d 100644
--- a/tests/libc/oracle/netdb_c.res.oracle
+++ b/tests/libc/oracle/netdb_c.res.oracle
@@ -85,9 +85,11 @@
 [eva] computing for function getaddrinfo <- main.
   Called from netdb_c.c:34.
 [eva] FRAMAC_SHARE/libc/netdb.c:56: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/netdb.c:56: allocating variable __malloc_getaddrinfo_l56
+[eva:malloc:new] FRAMAC_SHARE/libc/netdb.c:56: 
+  allocating variable __malloc_getaddrinfo_l56
 [eva] FRAMAC_SHARE/libc/netdb.c:58: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/netdb.c:58: allocating variable __malloc_getaddrinfo_l58
+[eva:malloc:new] FRAMAC_SHARE/libc/netdb.c:58: 
+  allocating variable __malloc_getaddrinfo_l58
 [eva] computing for function Frama_C_interval <- getaddrinfo <- main.
   Called from FRAMAC_SHARE/libc/netdb.c:60.
 [eva] using specification for function Frama_C_interval
@@ -149,7 +151,8 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/netdb.c:72: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/netdb.c:72: allocating variable __malloc_getaddrinfo_l72
+[eva:malloc:new] FRAMAC_SHARE/libc/netdb.c:72: 
+  allocating variable __malloc_getaddrinfo_l72
 [eva] computing for function strcpy <- getaddrinfo <- main.
   Called from FRAMAC_SHARE/libc/netdb.c:74.
 [eva] using specification for function strcpy
@@ -170,7 +173,7 @@
 [eva] Done for function gai_strerror
 [eva] computing for function fprintf_va_1 <- main.
   Called from netdb_c.c:36.
-[eva] using specification for function fprintf_va_1
+[eva] using specification for function fprintf
 [eva] netdb_c.c:36: 
   function fprintf_va_1: precondition valid_read_string(param0) got status valid.
 [eva] netdb_c.c:36: 
@@ -195,7 +198,6 @@
 [eva] Done for function close
 [eva] computing for function fprintf_va_2 <- main.
   Called from netdb_c.c:57.
-[eva] using specification for function fprintf_va_2
 [eva] netdb_c.c:57: function fprintf_va_2: precondition got status valid.
 [eva] Done for function fprintf_va_2
 [eva] computing for function exit <- main.
@@ -231,7 +233,7 @@
                           gethostbyname <- main.
   Called from FRAMAC_SHARE/libc/netdb.c:103.
 [eva] Done for function Frama_C_char_interval
-[eva] FRAMAC_SHARE/libc/netdb.c:102: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/netdb.c:102: starting to merge loop iterations
 [eva] computing for function Frama_C_char_interval <- res_search <- 
                           gethostbyname <- main.
   Called from FRAMAC_SHARE/libc/netdb.c:103.
diff --git a/tests/libc/oracle/netinet_in_h.res.oracle b/tests/libc/oracle/netinet_in_h.res.oracle
index fc01b99309a8d22f6e12912c97e97e6edad7bcaa..ea3b1d86fcc4a6ae6661698467666087fb0b757e 100644
--- a/tests/libc/oracle/netinet_in_h.res.oracle
+++ b/tests/libc/oracle/netinet_in_h.res.oracle
@@ -10,7 +10,7 @@
 [eva] Done for function inet_ntoa
 [eva] computing for function printf_va_1 <- main.
   Called from netinet_in_h.c:6.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] netinet_in_h.c:6: 
   function printf_va_1: precondition valid_read_string(param0) got status valid.
 [eva] netinet_in_h.c:6: 
diff --git a/tests/libc/oracle/pthread_h.res.oracle b/tests/libc/oracle/pthread_h.res.oracle
index d2d451907e89b55691ef2169aa49bd1e01e6264e..65333319be6e528f1133b67f364f1087ea70897d 100644
--- a/tests/libc/oracle/pthread_h.res.oracle
+++ b/tests/libc/oracle/pthread_h.res.oracle
@@ -19,7 +19,7 @@
 [eva] Done for function pthread_create
 [eva] computing for function printf_va_2 <- main.
   Called from pthread_h.c:22.
-[eva] using specification for function printf_va_2
+[eva] using specification for function printf
 [eva] pthread_h.c:22: function printf_va_2: precondition got status valid.
 [eva] Done for function printf_va_2
 [eva] computing for function printf_va_2 <- main.
@@ -30,7 +30,6 @@
 [eva] Done for function printf_va_2
 [eva] computing for function printf_va_3 <- main.
   Called from pthread_h.c:25.
-[eva] using specification for function printf_va_3
 [eva] pthread_h.c:25: function printf_va_3: precondition got status valid.
 [eva] Done for function printf_va_3
 [eva] computing for function pthread_setname_np <- main.
@@ -47,7 +46,6 @@
 [eva] Done for function pthread_getname_np
 [eva] computing for function printf_va_4 <- main.
   Called from pthread_h.c:30.
-[eva] using specification for function printf_va_4
 [eva:alarm] pthread_h.c:30: Warning: 
   function printf_va_4: precondition valid_read_string(param0) got status unknown.
 [eva] pthread_h.c:30: 
@@ -57,7 +55,6 @@
   Called from pthread_h.c:35.
 [eva] computing for function printf_va_1 <- start_routine <- main.
   Called from pthread_h.c:11.
-[eva] using specification for function printf_va_1
 [eva] pthread_h.c:11: function printf_va_1: precondition got status valid.
 [eva] Done for function printf_va_1
 [eva] Recording results for start_routine
@@ -70,7 +67,6 @@
 [eva] Done for function pthread_join
 [eva] computing for function printf_va_5 <- main.
   Called from pthread_h.c:39.
-[eva] using specification for function printf_va_5
 [eva] pthread_h.c:39: function printf_va_5: precondition got status valid.
 [eva] Done for function printf_va_5
 [eva] computing for function printf_va_5 <- main.
@@ -83,7 +79,6 @@
   out of bounds read. assert \valid_read(retv);
 [eva] computing for function printf_va_6 <- main.
   Called from pthread_h.c:42.
-[eva] using specification for function printf_va_6
 [eva] pthread_h.c:42: function printf_va_6: precondition got status valid.
 [eva] Done for function printf_va_6
 [eva] Recording results for main
diff --git a/tests/libc/oracle/search_h.res.oracle b/tests/libc/oracle/search_h.res.oracle
index df0333934a7a8ca8306cd44b05641c2f810afd21..f3a24652dc25a198f18e79333b456cd0b9cff435 100644
--- a/tests/libc/oracle/search_h.res.oracle
+++ b/tests/libc/oracle/search_h.res.oracle
@@ -20,7 +20,7 @@
   accessing uninitialized left-value.
   assert \initialized(&str[(int)(length - 1)]);
 [eva] search_h.c:30: Call to builtin malloc
-[eva] search_h.c:30: allocating variable __malloc_main_l30
+[eva:malloc:new] search_h.c:30: allocating variable __malloc_main_l30
 [eva] computing for function strcpy <- main.
   Called from search_h.c:31.
 [eva] using specification for function strcpy
@@ -48,7 +48,7 @@
   out of bounds read. assert \valid_read((struct element **)node);
 [eva] computing for function fprintf_va_1 <- main.
   Called from search_h.c:36.
-[eva] using specification for function fprintf_va_1
+[eva] using specification for function fprintf
 [eva] search_h.c:36: function fprintf_va_1: precondition got status valid.
 [eva] Done for function fprintf_va_1
 [eva] computing for function exit <- main.
diff --git a/tests/libc/oracle/socket.0.res.oracle b/tests/libc/oracle/socket.0.res.oracle
index de9e0f72d413ad09b208ca4739816223a752a7e1..50dd89548c6bc593549fdcb08abc9a45f821964f 100644
--- a/tests/libc/oracle/socket.0.res.oracle
+++ b/tests/libc/oracle/socket.0.res.oracle
@@ -17,7 +17,7 @@
 [eva] Done for function socketpair
 [eva] computing for function fprintf_va_1 <- init_sockets <- main.
   Called from socket.c:52.
-[eva] using specification for function fprintf_va_1
+[eva] using specification for function fprintf
 [eva] socket.c:52: function fprintf_va_1: precondition got status valid.
 [eva] Done for function fprintf_va_1
 [eva] computing for function exit <- init_sockets <- main.
@@ -55,7 +55,7 @@
 [eva] Done for function read
 [eva] computing for function printf_va_1 <- test_read <- main.
   Called from socket.c:62.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva:alarm] socket.c:62: Warning: 
   function printf_va_1: precondition valid_read_string(param0) got status unknown.
 [eva] socket.c:62: 
@@ -83,7 +83,6 @@
   assert \initialized((char *)rcv_buffer_scattered1);
 [eva] computing for function printf_va_2 <- test_readv <- main.
   Called from socket.c:75.
-[eva] using specification for function printf_va_2
 [eva:alarm] socket.c:75: Warning: 
   function printf_va_2: precondition valid_read_nstring(param0, 2) got status unknown.
 [eva:alarm] socket.c:75: Warning: 
@@ -113,7 +112,6 @@
   assert \initialized((char *)rcv_buffer_scattered1);
 [eva] computing for function printf_va_3 <- test_recvmsg <- main.
   Called from socket.c:95.
-[eva] using specification for function printf_va_3
 [eva:alarm] socket.c:95: Warning: 
   function printf_va_3: precondition valid_read_nstring(param0, 2) got status unknown.
 [eva:alarm] socket.c:95: Warning: 
diff --git a/tests/libc/oracle/socket.1.res.oracle b/tests/libc/oracle/socket.1.res.oracle
index 2d2f6878bba16e4f9b93d4ee980002127e25faf2..ed8486ee0b606634c5f9c06adacd1cd64acc8459 100644
--- a/tests/libc/oracle/socket.1.res.oracle
+++ b/tests/libc/oracle/socket.1.res.oracle
@@ -17,7 +17,7 @@
 [eva] Done for function socketpair
 [eva] computing for function fprintf_va_1 <- init_sockets <- main.
   Called from socket.c:52.
-[eva] using specification for function fprintf_va_1
+[eva] using specification for function fprintf
 [eva] socket.c:52: function fprintf_va_1: precondition got status valid.
 [eva] Done for function fprintf_va_1
 [eva] computing for function exit <- init_sockets <- main.
@@ -55,7 +55,7 @@
 [eva] Done for function read
 [eva] computing for function printf_va_1 <- test_read <- main.
   Called from socket.c:62.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva:alarm] socket.c:62: Warning: 
   function printf_va_1: precondition valid_read_string(param0) got status unknown.
 [eva] socket.c:62: 
@@ -83,7 +83,6 @@
   assert \initialized((char *)rcv_buffer_scattered1);
 [eva] computing for function printf_va_2 <- test_readv <- main.
   Called from socket.c:75.
-[eva] using specification for function printf_va_2
 [eva:alarm] socket.c:75: Warning: 
   function printf_va_2: precondition valid_read_nstring(param0, 2) got status unknown.
 [eva:alarm] socket.c:75: Warning: 
@@ -113,7 +112,6 @@
   assert \initialized((char *)rcv_buffer_scattered1);
 [eva] computing for function printf_va_3 <- test_recvmsg <- main.
   Called from socket.c:95.
-[eva] using specification for function printf_va_3
 [eva:alarm] socket.c:95: Warning: 
   function printf_va_3: precondition valid_read_nstring(param0, 2) got status unknown.
 [eva:alarm] socket.c:95: Warning: 
diff --git a/tests/libc/oracle/spawn_h.res.oracle b/tests/libc/oracle/spawn_h.res.oracle
index 04ce3cdeaf2eb25346dd838eb2ff86a512987a2d..ced0dbaf69de299969e198e9ed4d2e3bf8a3b3ee 100644
--- a/tests/libc/oracle/spawn_h.res.oracle
+++ b/tests/libc/oracle/spawn_h.res.oracle
@@ -37,7 +37,7 @@
   Called from spawn_h.c:68.
 [eva] using specification for function posix_spawnattr_setsigmask
 [eva] Done for function posix_spawnattr_setsigmask
-[eva] spawn_h.c:36: starting to merge loop iterations
+[eva:partition] spawn_h.c:36: starting to merge loop iterations
 [eva] computing for function getopt <- main.
   Called from spawn_h.c:36.
 [eva] Done for function getopt
@@ -120,7 +120,7 @@
   accessing uninitialized left-value. assert \initialized(&child_pid);
 [eva] computing for function printf_va_1 <- main.
   Called from spawn_h.c:101.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] spawn_h.c:101: function printf_va_1: precondition got status valid.
 [eva] Done for function printf_va_1
 [eva] computing for function waitpid <- main.
@@ -131,32 +131,27 @@
 [eva] Done for function waitpid
 [eva] computing for function printf_va_2 <- main.
   Called from spawn_h.c:110.
-[eva] using specification for function printf_va_2
 [eva] spawn_h.c:110: function printf_va_2: precondition got status valid.
 [eva] Done for function printf_va_2
 [eva:alarm] spawn_h.c:111: Warning: 
   accessing uninitialized left-value. assert \initialized(&status);
 [eva] computing for function printf_va_3 <- main.
   Called from spawn_h.c:112.
-[eva] using specification for function printf_va_3
 [eva] spawn_h.c:112: function printf_va_3: precondition got status valid.
 [eva] Done for function printf_va_3
 [eva] computing for function printf_va_4 <- main.
   Called from spawn_h.c:114.
-[eva] using specification for function printf_va_4
 [eva] spawn_h.c:114: function printf_va_4: precondition got status valid.
 [eva] Done for function printf_va_4
 [eva] computing for function printf_va_5 <- main.
   Called from spawn_h.c:116.
-[eva] using specification for function printf_va_5
 [eva] spawn_h.c:116: function printf_va_5: precondition got status valid.
 [eva] Done for function printf_va_5
 [eva] computing for function printf_va_6 <- main.
   Called from spawn_h.c:118.
-[eva] using specification for function printf_va_6
 [eva] spawn_h.c:118: function printf_va_6: precondition got status valid.
 [eva] Done for function printf_va_6
-[eva] spawn_h.c:105: starting to merge loop iterations
+[eva:partition] spawn_h.c:105: starting to merge loop iterations
 [eva] computing for function waitpid <- main.
   Called from spawn_h.c:106.
 [eva] Done for function waitpid
diff --git a/tests/libc/oracle/stdio_c.res.oracle b/tests/libc/oracle/stdio_c.res.oracle
index e848a868dcf313d9a95a4e396b439eff58ea26e2..e96e300c562ea4d70b5b579295c6ad9fd50c82c1 100644
--- a/tests/libc/oracle/stdio_c.res.oracle
+++ b/tests/libc/oracle/stdio_c.res.oracle
@@ -26,7 +26,8 @@
   function feof: precondition 'valid_stream' got status valid.
 [eva] Done for function feof
 [eva] FRAMAC_SHARE/libc/stdio.c:75: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/stdio.c:75: allocating variable __malloc_getline_l75
+[eva:malloc:new] FRAMAC_SHARE/libc/stdio.c:75: 
+  allocating variable __malloc_getline_l75
 [eva] computing for function ferror <- getline <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:84.
 [eva] FRAMAC_SHARE/libc/stdio.c:84: 
@@ -64,13 +65,14 @@
 [eva] Done for function Frama_C_unsigned_char_interval
 [eva] Recording results for fgetc
 [eva] Done for function fgetc
-[eva] FRAMAC_SHARE/libc/stdio.c:85: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:85: starting to merge loop iterations
 [eva] FRAMAC_SHARE/libc/stdio.c:86: Reusing old results for call to fgetc
 [eva] FRAMAC_SHARE/libc/stdio.c:106: Call to builtin realloc
 [eva] FRAMAC_SHARE/libc/stdio.c:106: 
   function realloc: precondition 'freeable' got status valid.
-[eva] FRAMAC_SHARE/libc/stdio.c:106: allocating variable __realloc_getline_l106
-[eva] FRAMAC_SHARE/libc/stdio.c:84: starting to merge loop iterations
+[eva:malloc:new] FRAMAC_SHARE/libc/stdio.c:106: 
+  allocating variable __realloc_getline_l106
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:84: starting to merge loop iterations
 [eva] computing for function ferror <- getline <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:84.
 [eva] Done for function ferror
@@ -120,7 +122,7 @@
 [eva:alarm] stdio_c.c:21: Warning: assertion 'read_bytes' got status unknown.
 [eva:alarm] stdio_c.c:22: Warning: 
   assertion 'allocated_enough' got status unknown.
-[eva] stdio_c.c:18: starting to merge loop iterations
+[eva:partition] stdio_c.c:18: starting to merge loop iterations
 [eva] computing for function getline <- main.
   Called from stdio_c.c:18.
 [eva] computing for function ferror <- getline <- main.
@@ -226,7 +228,8 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/stdio.c:124: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/stdio.c:124: allocating variable __malloc_vasprintf_l124
+[eva:malloc:new] FRAMAC_SHARE/libc/stdio.c:124: 
+  allocating variable __malloc_vasprintf_l124
 [eva] computing for function Frama_C_make_unknown <- vasprintf <- asprintf <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:129.
 [eva] using specification for function Frama_C_make_unknown
@@ -241,7 +244,7 @@
 [eva] Done for function asprintf
 [eva] computing for function printf_va_1 <- main.
   Called from stdio_c.c:33.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva:alarm] stdio_c.c:33: Warning: 
   function printf_va_1: precondition valid_read_string(param0) got status unknown.
 [eva] stdio_c.c:33: 
@@ -256,7 +259,8 @@
 [eva] Recording results for is_valid_mode
 [eva] Done for function is_valid_mode
 [eva] FRAMAC_SHARE/libc/stdio.c:231: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/stdio.c:231: allocating variable __malloc_fmemopen_l231
+[eva:malloc:new] FRAMAC_SHARE/libc/stdio.c:231: 
+  allocating variable __malloc_fmemopen_l231
 [eva] computing for function Frama_C_interval <- fmemopen <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:239.
 [eva] FRAMAC_SHARE/libc/stdio.c:239: 
@@ -324,7 +328,7 @@
 [eva] FRAMAC_SHARE/libc/stdio.c:167: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] FRAMAC_SHARE/libc/stdio.c:158: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:158: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- fgets <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:161.
 [eva] Done for function Frama_C_interval
@@ -361,16 +365,16 @@
   Called from stdio_c.c:79.
 [eva] computing for function vfscanf <- vscanf <- caller_stub_for_vscanf <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:513.
-[eva] FRAMAC_SHARE/libc/stdio.c:265: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:265: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- vfscanf <- vscanf <- 
                           caller_stub_for_vscanf <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:350.
 [eva] FRAMAC_SHARE/libc/stdio.c:350: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] FRAMAC_SHARE/libc/stdio.c:256: starting to merge loop iterations
-[eva] FRAMAC_SHARE/libc/stdio.c:280: starting to merge loop iterations
-[eva] FRAMAC_SHARE/libc/stdio.c:338: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:256: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:280: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:338: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- vfscanf <- vscanf <- 
                           caller_stub_for_vscanf <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:350.
@@ -670,7 +674,7 @@
                        (tmp_31 from vararg)
 [eva:alarm] FRAMAC_SHARE/libc/stdio.c:256: Warning: 
   out of bounds read. assert \valid_read(p);
-[eva] FRAMAC_SHARE/libc/stdio.c:291: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdio.c:291: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- vfscanf <- vscanf <- 
                           caller_stub_for_vscanf <- main.
   Called from FRAMAC_SHARE/libc/stdio.c:350.
diff --git a/tests/libc/oracle/stdio_h.res.oracle b/tests/libc/oracle/stdio_h.res.oracle
index f74af6c62a036f1b3cfeda344edb88b30fa5e759..501e3cbf6721700b16630e39626ebf133fa82927 100644
--- a/tests/libc/oracle/stdio_h.res.oracle
+++ b/tests/libc/oracle/stdio_h.res.oracle
@@ -86,7 +86,7 @@
 [eva] Done for function freopen
 [eva] computing for function printf_va_1 <- main.
   Called from stdio_h.c:36.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] stdio_h.c:36: function printf_va_1: precondition got status valid.
 [eva] Done for function printf_va_1
 [eva] computing for function fclose <- main.
@@ -146,7 +146,6 @@
   accessing uninitialized left-value. assert \initialized(&s);
 [eva] computing for function printf_va_2 <- main.
   Called from stdio_h.c:60.
-[eva] using specification for function printf_va_2
 [eva:alarm] stdio_h.c:60: Warning: 
   function printf_va_2: precondition valid_read_string(param0) got status invalid.
 [eva] stdio_h.c:60: 
@@ -180,7 +179,6 @@
   assert ¬\dangling(&s_0);
 [eva] computing for function printf_va_3 <- main.
   Called from stdio_h.c:71.
-[eva] using specification for function printf_va_3
 [eva:alarm] stdio_h.c:71: Warning: 
   function printf_va_3: precondition valid_read_string(param0) got status invalid.
 [eva] stdio_h.c:71: 
diff --git a/tests/libc/oracle/stdlib_c.0.res.oracle b/tests/libc/oracle/stdlib_c.0.res.oracle
index 0d0926fd83f88b499a5fca3e923c499dfb5b5d74..be4aa6d7da7bc2e3fadc135fe94d7d6dc417c1da 100644
--- a/tests/libc/oracle/stdlib_c.0.res.oracle
+++ b/tests/libc/oracle/stdlib_c.0.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   
 [eva] stdlib_c.c:15: Call to builtin Frama_C_calloc for function calloc
-[eva] stdlib_c.c:15: allocating variable __calloc_main_l15
+[eva:malloc:new] stdlib_c.c:15: allocating variable __calloc_main_l15
 [eva] stdlib_c.c:17: assertion got status valid.
 [eva] computing for function Frama_C_size_t_interval <- main.
   Called from stdlib_c.c:21.
@@ -19,7 +19,7 @@
 [eva] stdlib_c.c:22: Call to builtin Frama_C_calloc for function calloc
 [eva] stdlib_c.c:22: Warning: 
   calloc out of bounds: assert(nmemb * size <= SIZE_MAX)
-[eva] stdlib_c.c:22: allocating variable __calloc_main_l22
+[eva:malloc:new] stdlib_c.c:22: allocating variable __calloc_main_l22
 [eva] stdlib_c.c:22: Call to builtin Frama_C_calloc for function calloc
 [eva] stdlib_c.c:24: assertion got status valid.
 [eva] stdlib_c.c:28: Call to builtin Frama_C_calloc for function calloc
@@ -30,7 +30,7 @@
 [eva] stdlib_c.c:28: Call to builtin Frama_C_calloc for function calloc
 [eva] stdlib_c.c:29: assertion got status valid.
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
-[eva] stdlib_c.c:33: allocating variable __calloc_main_l33
+[eva:malloc:new] stdlib_c.c:33: allocating variable __calloc_main_l33
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
@@ -39,7 +39,7 @@
   resizing variable `__calloc_w_main_l33' (0..31) to fit 0..63
 [eva:alarm] stdlib_c.c:34: Warning: 
   out of bounds write. assert \valid(s + (size_t)(i - 1));
-[eva] stdlib_c.c:32: starting to merge loop iterations
+[eva:partition] stdlib_c.c:32: starting to merge loop iterations
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva:malloc] stdlib_c.c:33: 
   resizing variable `__calloc_w_main_l33' (0..31/63) to fit 0..63/95
@@ -64,7 +64,7 @@
 [eva] FRAMAC_SHARE/libc/stdlib.c:200: 
   assertion 'alignment_is_a_suitable_power_of_two' got status valid.
 [eva] FRAMAC_SHARE/libc/stdlib.c:203: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:203: 
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:203: 
   allocating variable __malloc_posix_memalign_l203
 [eva] Recording results for posix_memalign
 [eva] Done for function posix_memalign
@@ -77,7 +77,7 @@
 [eva] computing for function posix_memalign <- main.
   Called from stdlib_c.c:40.
 [eva] FRAMAC_SHARE/libc/stdlib.c:203: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:203: 
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:203: 
   allocating variable __malloc_posix_memalign_l203_0
 [eva] Recording results for posix_memalign
 [eva] Done for function posix_memalign
@@ -95,7 +95,7 @@
   Called from stdlib_c.c:41.
 [eva] Done for function free
 [eva] stdlib_c.c:44: Call to builtin Frama_C_malloc
-[eva] stdlib_c.c:44: allocating variable __malloc_main_l44
+[eva:malloc:new] stdlib_c.c:44: allocating variable __malloc_main_l44
 [eva] stdlib_c.c:44: Call to builtin Frama_C_malloc
 [eva] stdlib_c.c:44: Call to builtin Frama_C_malloc
 [eva] stdlib_c.c:44: Call to builtin Frama_C_malloc
@@ -169,7 +169,8 @@
   Called from FRAMAC_SHARE/libc/stdlib.c:226.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/stdlib.c:228: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:228: allocating variable __malloc_realpath_l228
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:228: 
+  allocating variable __malloc_realpath_l228
 [eva] computing for function Frama_C_make_unknown <- realpath <- main.
   Called from FRAMAC_SHARE/libc/stdlib.c:234.
 [eva] Done for function Frama_C_make_unknown
@@ -202,7 +203,7 @@
   Called from FRAMAC_SHARE/libc/stdlib.c:226.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/stdlib.c:228: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:228: 
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:228: 
   allocating variable __malloc_realpath_l228_0
 [eva] computing for function Frama_C_make_unknown <- realpath <- 
                           canonicalize_file_name <- main.
diff --git a/tests/libc/oracle/stdlib_c.1.res.oracle b/tests/libc/oracle/stdlib_c.1.res.oracle
index 679dd08280bd3dc8797e70018f62169126c4b578..12f98f40e145f2515d4a0e3380c1790809619a65 100644
--- a/tests/libc/oracle/stdlib_c.1.res.oracle
+++ b/tests/libc/oracle/stdlib_c.1.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   
 [eva] stdlib_c.c:15: Call to builtin Frama_C_calloc for function calloc
-[eva] stdlib_c.c:15: allocating variable __calloc_main_l15
+[eva:malloc:new] stdlib_c.c:15: allocating variable __calloc_main_l15
 [eva] stdlib_c.c:17: assertion got status valid.
 [eva] computing for function Frama_C_size_t_interval <- main.
   Called from stdlib_c.c:21.
@@ -16,7 +16,7 @@
 [eva] stdlib_c.c:22: Call to builtin Frama_C_calloc for function calloc
 [eva] stdlib_c.c:22: Warning: 
   calloc out of bounds: assert(nmemb * size <= SIZE_MAX)
-[eva] stdlib_c.c:22: allocating variable __calloc_main_l22
+[eva:malloc:new] stdlib_c.c:22: allocating variable __calloc_main_l22
 [eva] stdlib_c.c:24: assertion got status valid.
 [eva] stdlib_c.c:28: Call to builtin Frama_C_calloc for function calloc
 [eva] stdlib_c.c:28: Warning: 
@@ -24,7 +24,7 @@
 [eva] stdlib_c.c:28: Call to builtin Frama_C_calloc for function calloc
 [eva] stdlib_c.c:29: assertion got status valid.
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
-[eva] stdlib_c.c:33: allocating variable __calloc_main_l33
+[eva:malloc:new] stdlib_c.c:33: allocating variable __calloc_main_l33
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva:malloc] stdlib_c.c:33: 
@@ -55,7 +55,7 @@
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva:malloc] stdlib_c.c:33: 
   resizing variable `__calloc_w_main_l33' (0..31/159) to fit 0..191
-[eva] stdlib_c.c:32: starting to merge loop iterations
+[eva:partition] stdlib_c.c:32: starting to merge loop iterations
 [eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
 [eva:malloc] stdlib_c.c:33: 
   resizing variable `__calloc_w_main_l33' (0..31/191) to fit 0..191/223
@@ -80,7 +80,7 @@
 [eva] FRAMAC_SHARE/libc/stdlib.c:200: 
   assertion 'alignment_is_a_suitable_power_of_two' got status valid.
 [eva] FRAMAC_SHARE/libc/stdlib.c:203: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:203: 
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:203: 
   allocating variable __malloc_posix_memalign_l203
 [eva] Recording results for posix_memalign
 [eva] Done for function posix_memalign
@@ -93,7 +93,7 @@
 [eva] computing for function posix_memalign <- main.
   Called from stdlib_c.c:40.
 [eva] FRAMAC_SHARE/libc/stdlib.c:203: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:203: 
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:203: 
   allocating variable __malloc_posix_memalign_l203_0
 [eva] Recording results for posix_memalign
 [eva] Done for function posix_memalign
@@ -103,7 +103,7 @@
 [eva] stdlib_c.c:41: function free: precondition 'freeable' got status valid.
 [eva] Done for function free
 [eva] stdlib_c.c:44: Call to builtin Frama_C_malloc
-[eva] stdlib_c.c:44: allocating variable __malloc_main_l44
+[eva:malloc:new] stdlib_c.c:44: allocating variable __malloc_main_l44
 [eva] computing for function realpath <- main.
   Called from stdlib_c.c:46.
 [eva] computing for function Frama_C_interval <- realpath <- main.
@@ -159,7 +159,8 @@
   Called from FRAMAC_SHARE/libc/stdlib.c:226.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/stdlib.c:228: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:228: allocating variable __malloc_realpath_l228
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:228: 
+  allocating variable __malloc_realpath_l228
 [eva] computing for function Frama_C_make_unknown <- realpath <- main.
   Called from FRAMAC_SHARE/libc/stdlib.c:234.
 [eva] Done for function Frama_C_make_unknown
@@ -220,7 +221,7 @@
   Called from FRAMAC_SHARE/libc/stdlib.c:226.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/stdlib.c:228: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:228: 
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:228: 
   allocating variable __malloc_realpath_l228_0
 [eva] computing for function Frama_C_make_unknown <- realpath <- 
                           canonicalize_file_name <- main.
diff --git a/tests/libc/oracle/stdlib_c.2.res.oracle b/tests/libc/oracle/stdlib_c.2.res.oracle
index 07dfdf8eecf7b896d6b5961eea14dda6d942dc9f..17d53234f626cb8525f0cb21a48fed3b8e369d6c 100644
--- a/tests/libc/oracle/stdlib_c.2.res.oracle
+++ b/tests/libc/oracle/stdlib_c.2.res.oracle
@@ -7,7 +7,8 @@
 [eva] computing for function calloc <- main.
   Called from stdlib_c.c:15.
 [eva] FRAMAC_SHARE/libc/stdlib.c:72: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:72: allocating variable __malloc_calloc_l72
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:72: 
+  allocating variable __malloc_calloc_l72
 [eva] computing for function memset <- calloc <- main.
   Called from FRAMAC_SHARE/libc/stdlib.c:73.
 [eva] using specification for function memset
@@ -28,7 +29,8 @@
 [eva] computing for function calloc <- main.
   Called from stdlib_c.c:22.
 [eva] FRAMAC_SHARE/libc/stdlib.c:72: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:72: allocating variable __malloc_calloc_l72_0
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:72: 
+  allocating variable __malloc_calloc_l72_0
 [eva] computing for function memset <- calloc <- main.
   Called from FRAMAC_SHARE/libc/stdlib.c:73.
 [eva:alarm] FRAMAC_SHARE/libc/stdlib.c:73: Warning: 
@@ -45,13 +47,14 @@
 [eva] computing for function calloc <- main.
   Called from stdlib_c.c:33.
 [eva] FRAMAC_SHARE/libc/stdlib.c:72: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:72: allocating variable __malloc_calloc_l72_1
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:72: 
+  allocating variable __malloc_calloc_l72_1
 [eva] computing for function memset <- calloc <- main.
   Called from FRAMAC_SHARE/libc/stdlib.c:73.
 [eva] Done for function memset
 [eva] Recording results for calloc
 [eva] Done for function calloc
-[eva] stdlib_c.c:32: starting to merge loop iterations
+[eva:partition] stdlib_c.c:32: starting to merge loop iterations
 [eva] computing for function calloc <- main.
   Called from stdlib_c.c:33.
 [eva] FRAMAC_SHARE/libc/stdlib.c:72: Call to builtin Frama_C_malloc
@@ -99,7 +102,7 @@
 [eva] FRAMAC_SHARE/libc/stdlib.c:200: 
   assertion 'alignment_is_a_suitable_power_of_two' got status valid.
 [eva] FRAMAC_SHARE/libc/stdlib.c:203: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:203: 
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:203: 
   allocating variable __malloc_posix_memalign_l203
 [eva] Recording results for posix_memalign
 [eva] Done for function posix_memalign
@@ -112,7 +115,7 @@
 [eva] computing for function posix_memalign <- main.
   Called from stdlib_c.c:40.
 [eva] FRAMAC_SHARE/libc/stdlib.c:203: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:203: 
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:203: 
   allocating variable __malloc_posix_memalign_l203_0
 [eva] Recording results for posix_memalign
 [eva] Done for function posix_memalign
@@ -122,7 +125,7 @@
 [eva] stdlib_c.c:41: function free: precondition 'freeable' got status valid.
 [eva] Done for function free
 [eva] stdlib_c.c:44: Call to builtin Frama_C_malloc
-[eva] stdlib_c.c:44: allocating variable __malloc_main_l44
+[eva:malloc:new] stdlib_c.c:44: allocating variable __malloc_main_l44
 [eva] computing for function realpath <- main.
   Called from stdlib_c.c:46.
 [eva] computing for function Frama_C_interval <- realpath <- main.
@@ -166,7 +169,8 @@
   Called from FRAMAC_SHARE/libc/stdlib.c:226.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/stdlib.c:228: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:228: allocating variable __malloc_realpath_l228
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:228: 
+  allocating variable __malloc_realpath_l228
 [eva] computing for function Frama_C_make_unknown <- realpath <- main.
   Called from FRAMAC_SHARE/libc/stdlib.c:234.
 [eva] Done for function Frama_C_make_unknown
@@ -185,7 +189,7 @@
   Called from FRAMAC_SHARE/libc/stdlib.c:226.
 [eva] Done for function Frama_C_interval
 [eva] FRAMAC_SHARE/libc/stdlib.c:228: Call to builtin Frama_C_malloc
-[eva] FRAMAC_SHARE/libc/stdlib.c:228: 
+[eva:malloc:new] FRAMAC_SHARE/libc/stdlib.c:228: 
   allocating variable __malloc_realpath_l228_0
 [eva] computing for function Frama_C_make_unknown <- realpath <- 
                           canonicalize_file_name <- main.
diff --git a/tests/libc/oracle/stdlib_c_env.res.oracle b/tests/libc/oracle/stdlib_c_env.res.oracle
index a345521cbb76c3c51b6bbeadc1a6d1f6beace12d..f5ee976586d2810b5ee728e5f0d237bc605f4aee 100644
--- a/tests/libc/oracle/stdlib_c_env.res.oracle
+++ b/tests/libc/oracle/stdlib_c_env.res.oracle
@@ -29,7 +29,7 @@
 [eva] FRAMAC_SHARE/libc/stdlib.c:93: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] FRAMAC_SHARE/libc/stdlib.c:92: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/stdlib.c:92: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- __fc_initenv <- putenv <- main.
   Called from FRAMAC_SHARE/libc/stdlib.c:93.
 [eva] Done for function Frama_C_interval
diff --git a/tests/libc/oracle/string_c_generic.res.oracle b/tests/libc/oracle/string_c_generic.res.oracle
index 5f69195fdc530e046686a8258c38e515e8ff8518..8151dac4c393c66c38d90691e4b53edc8f607837 100644
--- a/tests/libc/oracle/string_c_generic.res.oracle
+++ b/tests/libc/oracle/string_c_generic.res.oracle
@@ -160,7 +160,8 @@
   function strncpy: precondition 'room_nstring' got status valid.
 [eva] string_c_generic.c:73: 
   function strncpy: precondition 'separation' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:249: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/string.c:249: 
+  starting to merge loop iterations
 [eva] FRAMAC_SHARE/libc/string.h:453: 
   function strncpy: postcondition 'result_ptr' got status valid.
 [eva] FRAMAC_SHARE/libc/string.h:454: 
@@ -211,7 +212,8 @@
   function strncmp: precondition 'valid_string_s1' got status valid.
 [eva] string_c_generic.c:82: 
   function strncmp: precondition 'valid_string_s2' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:154: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/string.c:154: 
+  starting to merge loop iterations
 [eva] FRAMAC_SHARE/libc/string.h:197: 
   cannot evaluate ACSL term, unsupported ACSL construct: logic function strncmp
 [eva:alarm] FRAMAC_SHARE/libc/string.h:197: Warning: 
@@ -323,7 +325,8 @@
 [eva] string_c_generic.c:94: 
   function strrchr: precondition 'valid_string_s' got status valid.
 [eva] FRAMAC_SHARE/libc/string.c:266: Reusing old results for call to strlen
-[eva] FRAMAC_SHARE/libc/string.c:266: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/string.c:266: 
+  starting to merge loop iterations
 [eva] Recording results for strrchr
 [eva] Done for function strrchr
 [eva] Recording results for main
diff --git a/tests/libc/oracle/string_c_strchr.res.oracle b/tests/libc/oracle/string_c_strchr.res.oracle
index f662ee9b679729ec8850e666eef6139bf1ad9e4e..ce87495a81ef00a81661f7ce35e46a79a9cd7419 100644
--- a/tests/libc/oracle/string_c_strchr.res.oracle
+++ b/tests/libc/oracle/string_c_strchr.res.oracle
@@ -4,8 +4,10 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] string_c_strchr.c:57: Trace partitioning superposing up to 100 states
-[eva] string_c_strchr.c:59: Trace partitioning superposing up to 200 states
+[eva:partition] string_c_strchr.c:57: 
+  Trace partitioning superposing up to 100 states
+[eva:partition] string_c_strchr.c:59: 
+  Trace partitioning superposing up to 200 states
 [eva] computing for function strchr <- main.
   Called from string_c_strchr.c:62.
 [eva] string_c_strchr.c:62: 
@@ -42,7 +44,7 @@
   Called from string_c_strchr.c:67.
 [eva] string_c_strchr.c:67: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:258: 
+[eva:partition] FRAMAC_SHARE/libc/string.c:258: 
   Trace partitioning superposing up to 100 states
 [eva] Recording results for strchr
 [eva] Done for function strchr
@@ -170,7 +172,7 @@
   Called from string_c_strchr.c:87.
 [eva] string_c_strchr.c:87: 
   function strchr: precondition 'valid_string_s' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:258: 
+[eva:partition] FRAMAC_SHARE/libc/string.c:258: 
   Trace partitioning superposing up to 200 states
 [eva] Recording results for strchr
 [eva] Done for function strchr
diff --git a/tests/libc/oracle/string_c_strstr.res.oracle b/tests/libc/oracle/string_c_strstr.res.oracle
index 8fd087fb9906b0f99a4fcc16516552b3eb9a3bac..dbe981b448974886cbeffb2bee348b981d3ebb2a 100644
--- a/tests/libc/oracle/string_c_strstr.res.oracle
+++ b/tests/libc/oracle/string_c_strstr.res.oracle
@@ -68,7 +68,8 @@
   function strstr: precondition 'valid_string_haystack' got status valid.
 [eva] string_c_strstr.c:59: 
   function strstr: precondition 'valid_string_needle' got status valid.
-[eva] FRAMAC_SHARE/libc/string.c:306: starting to merge loop iterations
+[eva:partition] FRAMAC_SHARE/libc/string.c:306: 
+  starting to merge loop iterations
 [eva] Recording results for strstr
 [eva] Done for function strstr
 [eva] computing for function strstr <- main.
diff --git a/tests/libc/oracle/string_h.res.oracle b/tests/libc/oracle/string_h.res.oracle
index 098a1f4c9ae63d4ba8845ba4b3f9ccef2ed0d68f..6990b87fa3ba5e9731ee7c3dc7d88f2d7553a46f 100644
--- a/tests/libc/oracle/string_h.res.oracle
+++ b/tests/libc/oracle/string_h.res.oracle
@@ -63,7 +63,7 @@
 [eva] Done for function test_strstr
 [eva] computing for function test_strncat <- main.
   Called from string_h.c:160.
-[eva] string_h.c:34: Trace partitioning superposing up to 100 states
+[eva:partition] string_h.c:34: Trace partitioning superposing up to 100 states
 [eva] computing for function strncat <- test_strncat <- main.
   Called from string_h.c:36.
 [eva] using specification for function strncat
diff --git a/tests/libc/oracle/wchar_c_h.0.res.oracle b/tests/libc/oracle/wchar_c_h.0.res.oracle
index 1ad0e866db7b5fb22814ce3da43c47868764ca22..d113b492db563ec542b55768e3f5e23819b1d66b 100644
--- a/tests/libc/oracle/wchar_c_h.0.res.oracle
+++ b/tests/libc/oracle/wchar_c_h.0.res.oracle
@@ -188,7 +188,8 @@
 [eva] FRAMAC_SHARE/libc/wchar.c:98: 
   function wcslen: precondition 'valid_string_s' got status valid.
 [eva] FRAMAC_SHARE/libc/wchar.c:99: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/wchar.c:99: allocating variable __malloc_wcsdup_l99
+[eva:malloc:new] FRAMAC_SHARE/libc/wchar.c:99: 
+  allocating variable __malloc_wcsdup_l99
 [eva] computing for function wmemcpy <- wcsdup <- main.
   Called from FRAMAC_SHARE/libc/wchar.c:104.
 [eva] Recording results for wmemcpy
@@ -199,7 +200,8 @@
   Called from wchar_c_h.c:75.
 [eva] FRAMAC_SHARE/libc/wchar.c:98: Call to builtin wcslen
 [eva] FRAMAC_SHARE/libc/wchar.c:99: Call to builtin malloc
-[eva] FRAMAC_SHARE/libc/wchar.c:99: allocating variable __malloc_wcsdup_l99_0
+[eva:malloc:new] FRAMAC_SHARE/libc/wchar.c:99: 
+  allocating variable __malloc_wcsdup_l99_0
 [eva] computing for function wmemcpy <- wcsdup <- main.
   Called from FRAMAC_SHARE/libc/wchar.c:104.
 [eva] Recording results for wmemcpy
diff --git a/tests/misc/oracle/array_sizeof.res.oracle b/tests/misc/oracle/array_sizeof.res.oracle
index eaf47571fe4138632de5c421908141763ae76d84..41a92c98b9ca9311e424011ff70cb4ab35ea8513 100644
--- a/tests/misc/oracle/array_sizeof.res.oracle
+++ b/tests/misc/oracle/array_sizeof.res.oracle
@@ -11,7 +11,7 @@
   (unsigned int)(sizeof(unsigned char [1]) + sizeof(int));
 [eva] array_sizeof.i:14: assertion 'alloca_bounds' got status valid.
 [eva] array_sizeof.i:14: Call to builtin __fc_vla_alloc
-[eva] array_sizeof.i:14: allocating variable __malloc_main_l14
+[eva:malloc:new] array_sizeof.i:14: allocating variable __malloc_main_l14
 [eva:alarm] array_sizeof.i:15: Warning: 
   accessing uninitialized left-value. assert \initialized(buf_0 + x);
 [eva] Recording results for main
diff --git a/tests/misc/oracle/audit-out.json b/tests/misc/oracle/audit-out.json
index 797055f81dffa3ddfba8b968fa68c8fdfff8742e..87a6533a18367d35d29ca8e57677ab9d3089565a 100644
--- a/tests/misc/oracle/audit-out.json
+++ b/tests/misc/oracle/audit-out.json
@@ -47,7 +47,7 @@
         "garbled-mix:assigns", "garbled-mix:summary", "garbled-mix:write",
         "invalid-assigns", "loop-unroll:auto", "loop-unroll:missing",
         "loop-unroll:missing:for", "loop-unroll:partial", "malloc:weak",
-        "watchpoint"
+        "recursion", "watchpoint"
       ]
     }
   },
diff --git a/tests/misc/oracle/ulevel.res.oracle b/tests/misc/oracle/ulevel.res.oracle
index f80b3c79df1c3691b6f24442b0f6f2f3e32da59a..573fb85e70dd7aa85f30eaa189860f34c11203cc 100644
--- a/tests/misc/oracle/ulevel.res.oracle
+++ b/tests/misc/oracle/ulevel.res.oracle
@@ -2,8 +2,8 @@
 [eva] Analyzing a complete application starting at main
 [eva:initial-state] Values of globals at initialization
   
-[eva] ulevel.i:13: starting to merge loop iterations
-[eva] ulevel.i:12: starting to merge loop iterations
+[eva:partition] ulevel.i:13: starting to merge loop iterations
+[eva:partition] ulevel.i:12: starting to merge loop iterations
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   i ∈ {4}
diff --git a/tests/misc/oracle/widen_hints.2.res.oracle b/tests/misc/oracle/widen_hints.2.res.oracle
index 3666a12af959430f3120df4cf531f10bd2d5d1e9..2a74b4a7fad96e0c83fbe57c9c4fe0d403119bc7 100644
--- a/tests/misc/oracle/widen_hints.2.res.oracle
+++ b/tests/misc/oracle/widen_hints.2.res.oracle
@@ -11,26 +11,26 @@
   x ∈ {9}
   not_const ∈ {42}
 [eva:widen-hints] widen_hints.c:74: computing dynamic hints for statement 16
-[eva] widen_hints.c:75: starting to merge loop iterations
-[eva] widen_hints.c:74: starting to merge loop iterations
+[eva:partition] widen_hints.c:75: starting to merge loop iterations
+[eva:partition] widen_hints.c:74: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:90: computing dynamic hints for statement 30
-[eva] widen_hints.c:91: starting to merge loop iterations
-[eva] widen_hints.c:90: starting to merge loop iterations
+[eva:partition] widen_hints.c:91: starting to merge loop iterations
+[eva:partition] widen_hints.c:90: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:99: computing dynamic hints for statement 48
 [eva:widen-hints] widen_hints.c:99: 
   adding new base due to dynamic widen hint: ip, { 87 }
-[eva] widen_hints.c:100: starting to merge loop iterations
-[eva] widen_hints.c:99: starting to merge loop iterations
+[eva:partition] widen_hints.c:100: starting to merge loop iterations
+[eva:partition] widen_hints.c:99: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:109: computing dynamic hints for statement 67
 [eva:widen-hints] widen_hints.c:109: 
   adding new base due to dynamic widen hint: ip2, { 87 }
-[eva] widen_hints.c:110: starting to merge loop iterations
-[eva] widen_hints.c:109: starting to merge loop iterations
+[eva:partition] widen_hints.c:110: starting to merge loop iterations
+[eva:partition] widen_hints.c:109: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:120: computing dynamic hints for statement 91
 [eva:widen-hints] widen_hints.c:120: 
   adding new base due to dynamic widen hint: iarray, { 87 }
-[eva] widen_hints.c:120: starting to merge loop iterations
-[eva] widen_hints.c:118: starting to merge loop iterations
+[eva:partition] widen_hints.c:120: starting to merge loop iterations
+[eva:partition] widen_hints.c:118: starting to merge loop iterations
 [eva] computing for function using_dynamic_global <- main.
   Called from widen_hints.c:126.
 [eva:widen-hints] widen_hints.c:60: computing dynamic hints for statement 2
@@ -42,10 +42,10 @@
   Called from widen_hints.c:126.
 [eva] Recording results for using_dynamic_global
 [eva] Done for function using_dynamic_global
-[eva] widen_hints.c:125: starting to merge loop iterations
+[eva:partition] widen_hints.c:125: starting to merge loop iterations
 [eva] computing for function using_dynamic_global <- main.
   Called from widen_hints.c:126.
-[eva] widen_hints.c:60: starting to merge loop iterations
+[eva:partition] widen_hints.c:60: starting to merge loop iterations
 [eva] Recording results for using_dynamic_global
 [eva] Done for function using_dynamic_global
 [eva] computing for function using_dynamic_global <- main.
diff --git a/tests/misc/oracle/widen_hints.3.res.oracle b/tests/misc/oracle/widen_hints.3.res.oracle
index ad14f519cfb65e079593c92ccd9f1b610b7ef826..36f486d91041d09e451c035e513c29d5eecf214a 100644
--- a/tests/misc/oracle/widen_hints.3.res.oracle
+++ b/tests/misc/oracle/widen_hints.3.res.oracle
@@ -13,33 +13,33 @@
   x ∈ {9}
   not_const ∈ {42}
 [eva:widen-hints] widen_hints.c:74: computing dynamic hints for statement 36
-[eva] widen_hints.c:74: starting to merge loop iterations
-[eva] widen_hints.c:75: starting to merge loop iterations
+[eva:partition] widen_hints.c:74: starting to merge loop iterations
+[eva:partition] widen_hints.c:75: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:82: computing dynamic hints for statement 50
 [eva] computing for function f <- main.
   Called from widen_hints.c:82.
-[eva] widen_hints.c:43: starting to merge loop iterations
-[eva] widen_hints.c:44: starting to merge loop iterations
+[eva:partition] widen_hints.c:43: starting to merge loop iterations
+[eva:partition] widen_hints.c:44: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
 [eva:widen-hints] widen_hints.c:90: computing dynamic hints for statement 52
-[eva] widen_hints.c:90: starting to merge loop iterations
-[eva] widen_hints.c:91: starting to merge loop iterations
+[eva:partition] widen_hints.c:90: starting to merge loop iterations
+[eva:partition] widen_hints.c:91: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:99: computing dynamic hints for statement 70
 [eva:widen-hints] widen_hints.c:99: 
   adding new base due to dynamic widen hint: ip, { 87 }
-[eva] widen_hints.c:99: starting to merge loop iterations
-[eva] widen_hints.c:100: starting to merge loop iterations
+[eva:partition] widen_hints.c:99: starting to merge loop iterations
+[eva:partition] widen_hints.c:100: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:109: computing dynamic hints for statement 89
 [eva:widen-hints] widen_hints.c:109: 
   adding new base due to dynamic widen hint: ip2, { 87 }
-[eva] widen_hints.c:109: starting to merge loop iterations
-[eva] widen_hints.c:110: starting to merge loop iterations
+[eva:partition] widen_hints.c:109: starting to merge loop iterations
+[eva:partition] widen_hints.c:110: starting to merge loop iterations
 [eva:widen-hints] widen_hints.c:120: computing dynamic hints for statement 113
 [eva:widen-hints] widen_hints.c:120: 
   adding new base due to dynamic widen hint: iarray, { 87 }
-[eva] widen_hints.c:118: starting to merge loop iterations
-[eva] widen_hints.c:120: starting to merge loop iterations
+[eva:partition] widen_hints.c:118: starting to merge loop iterations
+[eva:partition] widen_hints.c:120: starting to merge loop iterations
 [eva] computing for function using_dynamic_global <- main.
   Called from widen_hints.c:126.
 [eva:widen-hints] widen_hints.c:60: computing dynamic hints for statement 22
@@ -47,10 +47,10 @@
   adding new base due to dynamic widen hint: outer_i, { 87 }
 [eva] Recording results for using_dynamic_global
 [eva] Done for function using_dynamic_global
-[eva] widen_hints.c:125: starting to merge loop iterations
+[eva:partition] widen_hints.c:125: starting to merge loop iterations
 [eva] computing for function using_dynamic_global <- main.
   Called from widen_hints.c:126.
-[eva] widen_hints.c:60: starting to merge loop iterations
+[eva:partition] widen_hints.c:60: starting to merge loop iterations
 [eva] Recording results for using_dynamic_global
 [eva] Done for function using_dynamic_global
 [eva] computing for function using_dynamic_global <- main.
diff --git a/tests/misc/oracle/widen_hints2.0.res.oracle b/tests/misc/oracle/widen_hints2.0.res.oracle
index 270bbf5e2d0869c677441250815033fa5d356d60..58bf3224c2737565fb4fb4b9d7b930c17c94dbb5 100644
--- a/tests/misc/oracle/widen_hints2.0.res.oracle
+++ b/tests/misc/oracle/widen_hints2.0.res.oracle
@@ -32,28 +32,28 @@
 [eva:widen-hints] widen_hints2.c:48: computing dynamic hints for statement 45
 [eva:widen-hints] widen_hints2.c:50: computing dynamic hints for statement 48
 [eva:widen-hints] widen_hints2.c:52: computing dynamic hints for statement 54
-[eva] widen_hints2.c:50: starting to merge loop iterations
-[eva] widen_hints2.c:52: starting to merge loop iterations
+[eva:partition] widen_hints2.c:50: starting to merge loop iterations
+[eva:partition] widen_hints2.c:52: starting to merge loop iterations
 [eva:widen-hints] widen_hints2.c:63: computing dynamic hints for statement 66
-[eva] widen_hints2.c:63: starting to merge loop iterations
-[eva] widen_hints2.c:64: starting to merge loop iterations
+[eva:partition] widen_hints2.c:63: starting to merge loop iterations
+[eva:partition] widen_hints2.c:64: starting to merge loop iterations
 [eva:widen-hints] widen_hints2.c:72: computing dynamic hints for statement 82
-[eva] widen_hints2.c:72: starting to merge loop iterations
-[eva] widen_hints2.c:73: starting to merge loop iterations
+[eva:partition] widen_hints2.c:72: starting to merge loop iterations
+[eva:partition] widen_hints2.c:73: starting to merge loop iterations
 [eva:widen-hints] widen_hints2.c:79: computing dynamic hints for statement 97
-[eva] widen_hints2.c:79: starting to merge loop iterations
-[eva] widen_hints2.c:80: starting to merge loop iterations
+[eva:partition] widen_hints2.c:79: starting to merge loop iterations
+[eva:partition] widen_hints2.c:80: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from widen_hints2.c:85.
 [eva:widen-hints] widen_hints2.c:22: computing dynamic hints for statement 4
-[eva] widen_hints2.c:22: starting to merge loop iterations
-[eva] widen_hints2.c:23: starting to merge loop iterations
+[eva:partition] widen_hints2.c:22: starting to merge loop iterations
+[eva:partition] widen_hints2.c:23: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
 [eva] computing for function g <- main.
   Called from widen_hints2.c:86.
-[eva] widen_hints2.c:34: starting to merge loop iterations
-[eva] widen_hints2.c:35: starting to merge loop iterations
+[eva:partition] widen_hints2.c:34: starting to merge loop iterations
+[eva:partition] widen_hints2.c:35: starting to merge loop iterations
 [eva] Recording results for g
 [eva] Done for function g
 [eva] Recording results for main
diff --git a/tests/misc/oracle/widen_hints_float.res.oracle b/tests/misc/oracle/widen_hints_float.res.oracle
index f32842ede0057dd78941208b597363a31007bc88..529b432f1470e0620b714967f64850bd6438513e 100644
--- a/tests/misc/oracle/widen_hints_float.res.oracle
+++ b/tests/misc/oracle/widen_hints_float.res.oracle
@@ -15,19 +15,19 @@
 [eva] widen_hints_float.c:17: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:20: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:20: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- parabola <- main.
   Called from widen_hints_float.c:24.
 [eva] widen_hints_float.c:24: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:27: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:27: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- parabola <- main.
   Called from widen_hints_float.c:31.
 [eva] widen_hints_float.c:31: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:33: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:33: starting to merge loop iterations
 [eva:alarm] widen_hints_float.c:34: Warning: 
   non-finite double value.
   assert
@@ -45,7 +45,7 @@
 [eva] widen_hints_float.c:42: Call to builtin sin
 [eva] widen_hints_float.c:42: 
   function sin: precondition 'finite_arg' got status valid.
-[eva] widen_hints_float.c:41: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:41: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- trigo <- main.
   Called from widen_hints_float.c:42.
 [eva] Done for function Frama_C_double_interval
@@ -75,7 +75,7 @@
 [eva] widen_hints_float.c:49: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:48: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:48: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- first_order_filter <- main.
   Called from widen_hints_float.c:49.
 [eva] Done for function Frama_C_double_interval
@@ -96,7 +96,7 @@
 [eva] widen_hints_float.c:54: 
   function Frama_C_double_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_double_interval
-[eva] widen_hints_float.c:53: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:53: starting to merge loop iterations
 [eva] computing for function Frama_C_double_interval <- first_order_filter <- main.
   Called from widen_hints_float.c:54.
 [eva] Done for function Frama_C_double_interval
@@ -116,8 +116,8 @@
 [eva] Done for function first_order_filter
 [eva] computing for function newton_sqrt <- main.
   Called from widen_hints_float.c:73.
-[eva] widen_hints_float.c:59: starting to merge loop iterations
-[eva] widen_hints_float.c:64: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:59: starting to merge loop iterations
+[eva:partition] widen_hints_float.c:64: starting to merge loop iterations
 [eva] Recording results for newton_sqrt
 [eva] Done for function newton_sqrt
 [eva] Recording results for main
diff --git a/tests/pdg/oracle/annot.1.res.oracle b/tests/pdg/oracle/annot.1.res.oracle
index 8da8b690ebb44f6616acf5b70c9cc70373e6e5ee..e6f01840cee65b662639efa03aef6a8480a75ef5 100644
--- a/tests/pdg/oracle/annot.1.res.oracle
+++ b/tests/pdg/oracle/annot.1.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   G ∈ {0}
 [eva:alarm] annot.c:22: Warning: loop invariant got status unknown.
-[eva] annot.c:25: starting to merge loop iterations
+[eva:partition] annot.c:25: starting to merge loop iterations
 [eva:alarm] annot.c:26: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/pdg/oracle/dpds_intra.0.res.oracle b/tests/pdg/oracle/dpds_intra.0.res.oracle
index aeb0f129ba765eb3f2dfc14e1946e9ccf3a1cc00..82593a1efb092901c53ef2bc1aa3d5f34ac34b33 100644
--- a/tests/pdg/oracle/dpds_intra.0.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.0.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.1.res.oracle b/tests/pdg/oracle/dpds_intra.1.res.oracle
index 164f652335bda9be21facf70d6d4a5892dd223f4..6f952baf40dcbbf60847004bb94ef62e5c78f9c9 100644
--- a/tests/pdg/oracle/dpds_intra.1.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.1.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.2.res.oracle b/tests/pdg/oracle/dpds_intra.2.res.oracle
index 5cf673d3a936a0056bb26fc694a4690a73bf6b11..8de5bdef853c556d77535828d95c414895755ad9 100644
--- a/tests/pdg/oracle/dpds_intra.2.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.2.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.3.res.oracle b/tests/pdg/oracle/dpds_intra.3.res.oracle
index d7103d823ddef4078b7a5639b54f81dcc2d456ad..580d8e712a8e5325ca63703a27e484eda74ffa07 100644
--- a/tests/pdg/oracle/dpds_intra.3.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.3.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.4.res.oracle b/tests/pdg/oracle/dpds_intra.4.res.oracle
index 9056833fb6a15abd3911434b7176404b3b2fdfb5..30556cd9a5c6f6061fa4da8b3e22fe9e9b776985 100644
--- a/tests/pdg/oracle/dpds_intra.4.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.4.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.6.res.oracle b/tests/pdg/oracle/dpds_intra.6.res.oracle
index 3e78f042bf704a8569c8d476f511d33f593c0298..13f84aafad16013cbe10dcf0b54a53922d76cb4b 100644
--- a/tests/pdg/oracle/dpds_intra.6.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.6.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.7.res.oracle b/tests/pdg/oracle/dpds_intra.7.res.oracle
index 8c2148a68873b767432603d4e1e852c9186c298a..f62da4ef3cf98855e3a2eda443e084cd402e38e2 100644
--- a/tests/pdg/oracle/dpds_intra.7.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.7.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/dpds_intra.8.res.oracle b/tests/pdg/oracle/dpds_intra.8.res.oracle
index ad08f6c261d4643523bbb8a1b8a74d54f6bc7e0e..818690bbbf5352ab72ee17e7d8e16ea89367a9ba 100644
--- a/tests/pdg/oracle/dpds_intra.8.res.oracle
+++ b/tests/pdg/oracle/dpds_intra.8.res.oracle
@@ -52,7 +52,7 @@
   (tmp_4 from test_goto_else())
 [eva] computing for function test_simple_loop <- main.
   Called from dpds_intra.c:131.
-[eva] dpds_intra.c:99: starting to merge loop iterations
+[eva:partition] dpds_intra.c:99: starting to merge loop iterations
 [eva:alarm] dpds_intra.c:100: Warning: 
   signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for test_simple_loop
diff --git a/tests/pdg/oracle/loops.0.res.oracle b/tests/pdg/oracle/loops.0.res.oracle
index f80ca93825bd8c00e55b431dd0f43a05e657659b..aa1756957bd3d436f1a78dbcf6b4944796685665 100644
--- a/tests/pdg/oracle/loops.0.res.oracle
+++ b/tests/pdg/oracle/loops.0.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:41: starting to merge loop iterations
+[eva:partition] loops.c:41: starting to merge loop iterations
 [eva:alarm] loops.c:42: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva] Recording results for simple
 [eva] Done for function simple
diff --git a/tests/pdg/oracle/loops.1.res.oracle b/tests/pdg/oracle/loops.1.res.oracle
index ca556ac6f018107078bdd6dde224b1a4dcc7461a..3761f0fe9c737ab7134b6833d7bbf258b0a32fb2 100644
--- a/tests/pdg/oracle/loops.1.res.oracle
+++ b/tests/pdg/oracle/loops.1.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:51: starting to merge loop iterations
+[eva:partition] loops.c:51: starting to merge loop iterations
 [eva:alarm] loops.c:53: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva] Recording results for simple_with_break
 [eva] Done for function simple_with_break
diff --git a/tests/pdg/oracle/loops.2.res.oracle b/tests/pdg/oracle/loops.2.res.oracle
index ee9a26d792db2b4be62149d93f523776cd2dca17..4bc98d4bfe4dbf76d99bcd41b968f6639e96f755 100644
--- a/tests/pdg/oracle/loops.2.res.oracle
+++ b/tests/pdg/oracle/loops.2.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:65: starting to merge loop iterations
+[eva:partition] loops.c:65: starting to merge loop iterations
 [eva:alarm] loops.c:66: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva:alarm] loops.c:67: Warning: signed overflow. assert i + 1 ≤ 2147483647;
 [eva] Recording results for infinite
diff --git a/tests/pdg/oracle/loops.3.res.oracle b/tests/pdg/oracle/loops.3.res.oracle
index 02d5866e7398eb24a82f916ee0c4f144db83302a..012fa109855cb02d2925b4e471fd6ef1e42f7ef6 100644
--- a/tests/pdg/oracle/loops.3.res.oracle
+++ b/tests/pdg/oracle/loops.3.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:75: starting to merge loop iterations
+[eva:partition] loops.c:75: starting to merge loop iterations
 [eva:alarm] loops.c:76: Warning: signed overflow. assert s + 2 ≤ 2147483647;
 [eva] Recording results for infinite2
 [eva] Done for function infinite2
diff --git a/tests/pdg/oracle/loops.4.res.oracle b/tests/pdg/oracle/loops.4.res.oracle
index 6595f2a76ee21d78cfd591a51314461f672bdf6e..a65e7652c3b83db83447ab951e66317e0b891a8a 100644
--- a/tests/pdg/oracle/loops.4.res.oracle
+++ b/tests/pdg/oracle/loops.4.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:84: starting to merge loop iterations
+[eva:partition] loops.c:84: starting to merge loop iterations
 [eva:alarm] loops.c:88: Warning: signed overflow. assert i + 2 ≤ 2147483647;
 [eva] Recording results for maybe_infinite
 [eva] Done for function maybe_infinite
diff --git a/tests/pdg/oracle/loops.5.res.oracle b/tests/pdg/oracle/loops.5.res.oracle
index 63c95719e2ff28749893cdcf477a59caeb9315c1..f7df38aa5302b065d8f887258449beaccd04708b 100644
--- a/tests/pdg/oracle/loops.5.res.oracle
+++ b/tests/pdg/oracle/loops.5.res.oracle
@@ -4,9 +4,9 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   after ∈ [--..--]
-[eva] loops.c:99: starting to merge loop iterations
+[eva:partition] loops.c:99: starting to merge loop iterations
 [eva:alarm] loops.c:110: Warning: signed overflow. assert i1 + 2 ≤ 2147483647;
-[eva] loops.c:105: starting to merge loop iterations
+[eva:partition] loops.c:105: starting to merge loop iterations
 [eva:alarm] loops.c:106: Warning: signed overflow. assert i2 + 1 ≤ 2147483647;
 [eva] Recording results for two_infinite_loops
 [eva] Done for function two_infinite_loops
diff --git a/tests/pdg/oracle/no_body.res.oracle b/tests/pdg/oracle/no_body.res.oracle
index 64da29a0597d3ac282529251b632843281f4bc38..4b1547c9ed4f3aeb41a48000cafec0633c8a8660 100644
--- a/tests/pdg/oracle/no_body.res.oracle
+++ b/tests/pdg/oracle/no_body.res.oracle
@@ -17,7 +17,7 @@
   Called from no_body.c:16.
 [eva] Done for function f
 [eva:alarm] no_body.c:18: Warning: signed overflow. assert G + 1 ≤ 2147483647;
-[eva] no_body.c:16: starting to merge loop iterations
+[eva:partition] no_body.c:16: starting to merge loop iterations
 [eva] computing for function f <- loop <- main.
   Called from no_body.c:16.
 [eva] Done for function f
diff --git a/tests/pdg/oracle/pb_infinite_loop.0.res.oracle b/tests/pdg/oracle/pb_infinite_loop.0.res.oracle
index 4ffcf852c1410334f2fa4ef04ad9cc09e30c9947..4f12f79c10fa36ffd31d675ec300f84f58adf34e 100644
--- a/tests/pdg/oracle/pb_infinite_loop.0.res.oracle
+++ b/tests/pdg/oracle/pb_infinite_loop.0.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   G ∈ [--..--]
-[eva] pb_infinite_loop.c:20: starting to merge loop iterations
+[eva:partition] pb_infinite_loop.c:20: starting to merge loop iterations
 [eva:alarm] pb_infinite_loop.c:23: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva:alarm] pb_infinite_loop.c:22: Warning: 
diff --git a/tests/pdg/oracle/pb_infinite_loop.1.res.oracle b/tests/pdg/oracle/pb_infinite_loop.1.res.oracle
index e83aa50ccc5952d6cac315e1039b90188c20d711..f70c76d3fca4937433c7431403942977d162f0aa 100644
--- a/tests/pdg/oracle/pb_infinite_loop.1.res.oracle
+++ b/tests/pdg/oracle/pb_infinite_loop.1.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   G ∈ [--..--]
-[eva] pb_infinite_loop.c:32: starting to merge loop iterations
+[eva:partition] pb_infinite_loop.c:32: starting to merge loop iterations
 [eva:alarm] pb_infinite_loop.c:34: Warning: 
   signed overflow. assert G + 1 ≤ 2147483647;
 [eva:alarm] pb_infinite_loop.c:35: Warning: 
diff --git a/tests/pdg/oracle/postdom.res.oracle b/tests/pdg/oracle/postdom.res.oracle
index 98f69a4410ca2c9c62d908b4a670266bc297d9d2..7fc5b6696d768c2c70fd67a89f16277cbce1d116 100644
--- a/tests/pdg/oracle/postdom.res.oracle
+++ b/tests/pdg/oracle/postdom.res.oracle
@@ -8,7 +8,7 @@
   Called from postdom.c:23.
 [eva] Recording results for __VERIFIER_assert
 [eva] Done for function __VERIFIER_assert
-[eva] postdom.c:20: starting to merge loop iterations
+[eva:partition] postdom.c:20: starting to merge loop iterations
 [eva] computing for function __VERIFIER_assert <- main.
   Called from postdom.c:23.
 [eva] Recording results for __VERIFIER_assert
diff --git a/tests/pdg/oracle/simple_call.1.res.oracle b/tests/pdg/oracle/simple_call.1.res.oracle
index 1dc23005ff8f8a2ea1856dfab0880ff9d45e8b26..57e504441aec0ae0758398c61f6ce099b1cbb2b8 100644
--- a/tests/pdg/oracle/simple_call.1.res.oracle
+++ b/tests/pdg/oracle/simple_call.1.res.oracle
@@ -13,7 +13,7 @@
   signed overflow. assert G + y ≤ 2147483647;
 [eva] Recording results for call
 [eva] Done for function call
-[eva] simple_call.c:51: starting to merge loop iterations
+[eva:partition] simple_call.c:51: starting to merge loop iterations
 [eva] computing for function call <- call_in_loop.
   Called from simple_call.c:52.
 [eva] Recording results for call
diff --git a/tests/pdg/oracle/simple_intra_slice.res.oracle b/tests/pdg/oracle/simple_intra_slice.res.oracle
index ccf3e7bbca97eebc74240453d2f5444d17274fef..01227dfa2e82f67fce639bbddc14df94d78f5b37 100644
--- a/tests/pdg/oracle/simple_intra_slice.res.oracle
+++ b/tests/pdg/oracle/simple_intra_slice.res.oracle
@@ -10,14 +10,14 @@
   S2 ∈ {0}
 [eva:alarm] simple_intra_slice.c:99: Warning: 
   signed overflow. assert -2147483648 ≤ uninit - 1;
-[eva] simple_intra_slice.c:98: starting to merge loop iterations
+[eva:partition] simple_intra_slice.c:98: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.c:99: Warning: 
   signed overflow. assert -2147483648 ≤ Unknown - 1;
 [eva:alarm] simple_intra_slice.c:99: Warning: 
   signed overflow. assert Unknown + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.c:101: Warning: 
   signed overflow. assert -2147483648 ≤ uninit2 - 1;
-[eva] simple_intra_slice.c:100: starting to merge loop iterations
+[eva:partition] simple_intra_slice.c:100: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.c:101: Warning: 
   signed overflow. assert S.a + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.c:101: Warning: 
diff --git a/tests/pdg/oracle/top_pdg_input.res.oracle b/tests/pdg/oracle/top_pdg_input.res.oracle
index 426525eb91b7ae2a846cfb84005e22e55b415688..270ff3f805b702f3e167ef9b3e60a8467a8f625e 100644
--- a/tests/pdg/oracle/top_pdg_input.res.oracle
+++ b/tests/pdg/oracle/top_pdg_input.res.oracle
@@ -32,7 +32,7 @@
   Called from top_pdg_input.c:40.
 [eva:alarm] top_pdg_input.c:31: Warning: 
   out of bounds read. assert \valid_read(q);
-[eva] top_pdg_input.c:31: starting to merge loop iterations
+[eva:partition] top_pdg_input.c:31: starting to merge loop iterations
 [eva:alarm] top_pdg_input.c:31: Warning: 
   signed overflow. assert k + 1 ≤ 2147483647;
 [eva] Recording results for strlen
diff --git a/tests/rte/oracle/value_rte.res.oracle b/tests/rte/oracle/value_rte.res.oracle
index b89b879da84b5270e5fd535d1c630f2efbc8eeb0..ee1ec8eedd4c5ab225c23bfde0adb1473d1a71cf 100644
--- a/tests/rte/oracle/value_rte.res.oracle
+++ b/tests/rte/oracle/value_rte.res.oracle
@@ -11,7 +11,7 @@
 [eva] Done for function getchar
 [eva] value_rte.c:13: assertion 'rte,index_bound' got status valid.
 [eva] value_rte.c:15: assertion 'rte,signed_overflow' got status valid.
-[eva] value_rte.c:11: starting to merge loop iterations
+[eva:partition] value_rte.c:11: starting to merge loop iterations
 [eva] computing for function getchar <- main.
   Called from value_rte.c:12.
 [eva] Done for function getchar
diff --git a/tests/rte_manual/oracle/sizeof.res.oracle b/tests/rte_manual/oracle/sizeof.res.oracle
index 70fb18345d462c8a053a6a8892716ca055d9c8be..f7be049767799130b41f726a9195fa74ec6fd37b 100644
--- a/tests/rte_manual/oracle/sizeof.res.oracle
+++ b/tests/rte_manual/oracle/sizeof.res.oracle
@@ -8,11 +8,12 @@
   Called from sizeof.c:14.
 [eva] sizeof.c:9: assertion 'alloca_bounds' got status valid.
 [eva] sizeof.c:9: Call to builtin __fc_vla_alloc
-[eva] sizeof.c:9: allocating variable __malloc_fsize3_l9
+[eva:malloc:new] sizeof.c:9: allocating variable __malloc_fsize3_l9
 [eva] sizeof.c:9: Call to builtin __fc_vla_free
 [eva] Recording results for fsize3
 [eva] Done for function fsize3
-[eva] sizeof.c:14: freeing automatic bases: {__malloc_fsize3_l9}
+[eva:malloc:automatic-free] sizeof.c:14: 
+  freeing automatic bases: {__malloc_fsize3_l9}
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/saveload/oracle/basic_sav.1.res b/tests/saveload/oracle/basic_sav.1.res
index 1d94311d170fae5ee439de6ae7c13d04c8f994d7..4bbe7c80a48de54e0a4caa90a784949d9e9ce264 100644
--- a/tests/saveload/oracle/basic_sav.1.res
+++ b/tests/saveload/oracle/basic_sav.1.res
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   
 [eva] basic.i:20: assertion got status valid.
-[eva] basic.i:21: starting to merge loop iterations
+[eva:partition] basic.i:21: starting to merge loop iterations
 [eva:alarm] basic.i:21: Warning: signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/saveload/oracle/basic_sav.res b/tests/saveload/oracle/basic_sav.res
index 1d94311d170fae5ee439de6ae7c13d04c8f994d7..4bbe7c80a48de54e0a4caa90a784949d9e9ce264 100644
--- a/tests/saveload/oracle/basic_sav.res
+++ b/tests/saveload/oracle/basic_sav.res
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   
 [eva] basic.i:20: assertion got status valid.
-[eva] basic.i:21: starting to merge loop iterations
+[eva:partition] basic.i:21: starting to merge loop iterations
 [eva:alarm] basic.i:21: Warning: signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/saveload/oracle/bool_sav.res b/tests/saveload/oracle/bool_sav.res
index 841511fc87a2dcce6c5a66411451c944d11ff628..15f228c19e0eb451bf67346f21ec951fbc13fb64 100644
--- a/tests/saveload/oracle/bool_sav.res
+++ b/tests/saveload/oracle/bool_sav.res
@@ -8,33 +8,29 @@
 [eva] computing for function f <- main.
   Called from bool.c:27.
 [eva] bool.c:19: assertion got status valid.
-[eva] bool.c:20: starting to merge loop iterations
+[eva:partition] bool.c:20: starting to merge loop iterations
 [eva:alarm] bool.c:20: Warning: signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for f
 [eva] Done for function f
 [eva] computing for function printf_va_1 <- main.
   Called from bool.c:29.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] bool.c:29: function printf_va_1: precondition got status valid.
 [eva] Done for function printf_va_1
 [eva] computing for function printf_va_2 <- main.
   Called from bool.c:31.
-[eva] using specification for function printf_va_2
 [eva] bool.c:31: function printf_va_2: precondition got status valid.
 [eva] Done for function printf_va_2
 [eva] computing for function printf_va_3 <- main.
   Called from bool.c:33.
-[eva] using specification for function printf_va_3
 [eva] bool.c:33: function printf_va_3: precondition got status valid.
 [eva] Done for function printf_va_3
 [eva] computing for function printf_va_4 <- main.
   Called from bool.c:35.
-[eva] using specification for function printf_va_4
 [eva] bool.c:35: function printf_va_4: precondition got status valid.
 [eva] Done for function printf_va_4
 [eva] computing for function printf_va_5 <- main.
   Called from bool.c:37.
-[eva] using specification for function printf_va_5
 [eva] bool.c:37: function printf_va_5: precondition got status valid.
 [eva] Done for function printf_va_5
 [eva] Recording results for main
diff --git a/tests/saveload/oracle/deps_sav.res b/tests/saveload/oracle/deps_sav.res
index 21216900043eeb9fb9325a0ce012cb45d23a79aa..a71733a957806a297c363393bed9631227e77136 100644
--- a/tests/saveload/oracle/deps_sav.res
+++ b/tests/saveload/oracle/deps_sav.res
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] deps.i:21: starting to merge loop iterations
+[eva:partition] deps.i:21: starting to merge loop iterations
 [eva:alarm] deps.i:21: Warning: signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/saveload/oracle/segfault_datatypes_sav.res b/tests/saveload/oracle/segfault_datatypes_sav.res
index 4fae77424cedcdb4b28f3472e729206924c04b15..57c747f276adb7466f1f2d3ec0d45af766b7f2eb 100644
--- a/tests/saveload/oracle/segfault_datatypes_sav.res
+++ b/tests/saveload/oracle/segfault_datatypes_sav.res
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] segfault_datatypes.i:14: starting to merge loop iterations
+[eva:partition] segfault_datatypes.i:14: starting to merge loop iterations
 [eva:alarm] segfault_datatypes.i:14: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] Recording results for main
diff --git a/tests/scope/oracle/bts383.res.oracle b/tests/scope/oracle/bts383.res.oracle
index 975b6c1a98e84a8e0643d1da38f45494b0abc795..267972141e54904850134cd408b10bde289f56b6 100644
--- a/tests/scope/oracle/bts383.res.oracle
+++ b/tests/scope/oracle/bts383.res.oracle
@@ -24,13 +24,13 @@
   Called from bts383.c:60.
 [eva:alarm] bts383.c:20: Warning: out of bounds read. assert \valid_read(p);
 [eva:alarm] bts383.c:22: Warning: out of bounds read. assert \valid_read(p);
-[eva] bts383.c:21: starting to merge loop iterations
+[eva:partition] bts383.c:21: starting to merge loop iterations
 [eva] Recording results for loop1
 [eva] Done for function loop1
 [eva] computing for function loop2 <- main.
   Called from bts383.c:61.
 [eva:alarm] bts383.c:28: Warning: out of bounds read. assert \valid_read(p);
-[eva] bts383.c:27: starting to merge loop iterations
+[eva:partition] bts383.c:27: starting to merge loop iterations
 [eva:alarm] bts383.c:30: Warning: out of bounds read. assert \valid_read(p);
 [eva] Recording results for loop2
 [eva] Done for function loop2
@@ -45,7 +45,7 @@
   Called from bts383.c:36.
 [eva] using specification for function out_char
 [eva] Done for function out_char
-[eva] bts383.c:35: starting to merge loop iterations
+[eva:partition] bts383.c:35: starting to merge loop iterations
 [eva] computing for function out_char <- out_string <- main.
   Called from bts383.c:36.
 [eva] Done for function out_char
diff --git a/tests/scope/oracle/scope.2.res.oracle b/tests/scope/oracle/scope.2.res.oracle
index 6243d609fc10ccf231717239354dac953535ead3..8c740956e7ad11844f53be20478ff6cbbb87c4e1 100644
--- a/tests/scope/oracle/scope.2.res.oracle
+++ b/tests/scope/oracle/scope.2.res.oracle
@@ -6,7 +6,7 @@
   S1 ∈ {0}
   S2 ∈ {0}
   T[0..99] ∈ {0}
-[eva] scope.c:67: starting to merge loop iterations
+[eva:partition] scope.c:67: starting to merge loop iterations
 [eva:alarm] scope.c:68: Warning: signed overflow. assert a + 1 ≤ 2147483647;
 [eva:alarm] scope.c:69: Warning: signed overflow. assert b + 1 ≤ 2147483647;
 [eva:alarm] scope.c:70: Warning: signed overflow. assert s + 1 ≤ 2147483647;
diff --git a/tests/slicing/oracle/adpcm.1.res.oracle b/tests/slicing/oracle/adpcm.1.res.oracle
index 3898e3397e1c9c7d7bfff289aa0a83b15dcbc291..42d69b1ed6043083dc5ab28fbfb09c88246ee08c 100644
--- a/tests/slicing/oracle/adpcm.1.res.oracle
+++ b/tests/slicing/oracle/adpcm.1.res.oracle
@@ -378,7 +378,7 @@
   compressed[0..9] ∈ {0}
 [eva] computing for function encode <- main.
   Called from adpcm.c:608.
-[eva] adpcm.c:277: starting to merge loop iterations
+[eva:partition] adpcm.c:277: starting to merge loop iterations
 [eva:alarm] adpcm.c:278: Warning: 
   out of bounds read. assert \valid_read(tmp_3);
                       (tmp_3 from tqmf_ptr++)
@@ -402,7 +402,7 @@
 [eva:alarm] adpcm.c:283: Warning: 
   out of bounds read. assert \valid_read(tmp_9);
                       (tmp_9 from h_ptr++)
-[eva] adpcm.c:288: starting to merge loop iterations
+[eva:partition] adpcm.c:288: starting to merge loop iterations
 [eva:alarm] adpcm.c:288: Warning: 
   out of bounds read. assert \valid_read(tmp_11);
                       (tmp_11 from tqmf_ptr1--)
@@ -415,7 +415,7 @@
 [eva:alarm] adpcm.c:290: Warning: out of bounds write. assert \valid(tqmf_ptr);
 [eva] computing for function filtez <- encode <- main.
   Called from adpcm.c:301.
-[eva] adpcm.c:418: starting to merge loop iterations
+[eva:partition] adpcm.c:418: starting to merge loop iterations
 [eva:alarm] adpcm.c:419: Warning: 
   out of bounds read. assert \valid_read(tmp_1);
                       (tmp_1 from bpl++)
@@ -434,7 +434,7 @@
   Called from adpcm.c:444.
 [eva] Recording results for abs
 [eva] Done for function abs
-[eva] adpcm.c:453: starting to merge loop iterations
+[eva:partition] adpcm.c:453: starting to merge loop iterations
 [eva] Recording results for quantl
 [eva] Done for function quantl
 [eva] computing for function logscl <- encode <- main.
@@ -447,7 +447,7 @@
 [eva] Done for function scalel
 [eva] computing for function upzero <- encode <- main.
   Called from adpcm.c:331.
-[eva] adpcm.c:506: starting to merge loop iterations
+[eva:partition] adpcm.c:506: starting to merge loop iterations
 [eva] Recording results for upzero
 [eva] Done for function upzero
 [eva] computing for function uppol2 <- encode <- main.
@@ -481,7 +481,7 @@
 [eva] adpcm.c:262: function encode: postcondition got status valid.
 [eva] Recording results for encode
 [eva] Done for function encode
-[eva] adpcm.c:607: starting to merge loop iterations
+[eva:partition] adpcm.c:607: starting to merge loop iterations
 [eva] computing for function encode <- main.
   Called from adpcm.c:608.
 [eva:alarm] adpcm.c:278: Warning: 
@@ -547,7 +547,7 @@
 [eva] Done for function scalel
 [eva] computing for function upzero <- encode <- main.
   Called from adpcm.c:331.
-[eva] adpcm.c:512: starting to merge loop iterations
+[eva:partition] adpcm.c:512: starting to merge loop iterations
 [eva:alarm] adpcm.c:514: Warning: 
   signed overflow. assert 255L * (long)*(bli + i) ≤ 2147483647;
 [eva] Recording results for upzero
diff --git a/tests/slicing/oracle/bts1768.res.oracle b/tests/slicing/oracle/bts1768.res.oracle
index 6af07bc4453f80234d48517a5b94cc498a89e27e..5c9f5549e212665451c97e0fb952cfeef84cc784 100644
--- a/tests/slicing/oracle/bts1768.res.oracle
+++ b/tests/slicing/oracle/bts1768.res.oracle
@@ -73,7 +73,7 @@
   Called from bts1768.i:46.
 [eva] Recording results for fsm_transition
 [eva] Done for function fsm_transition
-[eva] bts1768.i:44: starting to merge loop iterations
+[eva:partition] bts1768.i:44: starting to merge loop iterations
 [eva] bts1768.i:45: Reusing old results for call to lecture
 [eva] computing for function fsm_transition <- main.
   Called from bts1768.i:46.
diff --git a/tests/slicing/oracle/bts336.5.res.oracle b/tests/slicing/oracle/bts336.5.res.oracle
index 47c323211974bd08e9b399572545496959641460..7954ece6a6480e5b30f3d55e4076cd86d7ac3826 100644
--- a/tests/slicing/oracle/bts336.5.res.oracle
+++ b/tests/slicing/oracle/bts336.5.res.oracle
@@ -35,7 +35,7 @@
 [from] Computing for function f4
 [from] Done for function f4
 [eva] Done for function f4
-[eva] bts336.i:77: starting to merge loop iterations
+[eva:partition] bts336.i:77: starting to merge loop iterations
 [eva] computing for function f4 <- main4.
   Called from bts336.i:78.
 [eva] Recording results for f4
diff --git a/tests/slicing/oracle/bts336.6.res.oracle b/tests/slicing/oracle/bts336.6.res.oracle
index b8ff3b8765d50bac660767ff417df9904b6a7da9..30b06e4d5aa6f06bbd4acb69c0a5a05eb6345d6f 100644
--- a/tests/slicing/oracle/bts336.6.res.oracle
+++ b/tests/slicing/oracle/bts336.6.res.oracle
@@ -35,7 +35,7 @@
 [from] Computing for function f4
 [from] Done for function f4
 [eva] Done for function f4
-[eva] bts336.i:77: starting to merge loop iterations
+[eva:partition] bts336.i:77: starting to merge loop iterations
 [eva] computing for function f4 <- main4.
   Called from bts336.i:78.
 [eva] Recording results for f4
diff --git a/tests/slicing/oracle/bts709.res.oracle b/tests/slicing/oracle/bts709.res.oracle
index 1607e1cc847e653267cc150a5348beda19626f37..c0dce2dda41aa73bb41541dd38e0740aef587ae7 100644
--- a/tests/slicing/oracle/bts709.res.oracle
+++ b/tests/slicing/oracle/bts709.res.oracle
@@ -34,7 +34,7 @@
 [eva] Done for function __FC_assert
 [eva] Recording results for func
 [eva] Done for function func
-[eva] bts709.c:46: starting to merge loop iterations
+[eva:partition] bts709.c:46: starting to merge loop iterations
 [eva] bts709.c:47: Reusing old results for call to inputsOf_testcase_func
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/slicing/oracle/call_demo.0.res.oracle b/tests/slicing/oracle/call_demo.0.res.oracle
index a6b181a272fd3b0fe205d81963bd472416114007..514c57b3862f405ae946dfcdfe75430e1c0ce1f0 100644
--- a/tests/slicing/oracle/call_demo.0.res.oracle
+++ b/tests/slicing/oracle/call_demo.0.res.oracle
@@ -9,7 +9,7 @@
   Called from call_demo.i:23.
 [eva] Recording results for oper
 [eva] Done for function oper
-[eva] call_demo.i:22: starting to merge loop iterations
+[eva:partition] call_demo.i:22: starting to merge loop iterations
 [eva] computing for function oper <- main.
   Called from call_demo.i:23.
 [eva] Recording results for oper
diff --git a/tests/slicing/oracle/call_demo.1.res.oracle b/tests/slicing/oracle/call_demo.1.res.oracle
index ba418bf4634fb649160685975f5334d5cf1e4036..c0fb77c2c1ae3931164780f69cacde451f8bcf7a 100644
--- a/tests/slicing/oracle/call_demo.1.res.oracle
+++ b/tests/slicing/oracle/call_demo.1.res.oracle
@@ -9,7 +9,7 @@
   Called from call_demo.i:23.
 [eva] Recording results for oper
 [eva] Done for function oper
-[eva] call_demo.i:22: starting to merge loop iterations
+[eva:partition] call_demo.i:22: starting to merge loop iterations
 [eva] computing for function oper <- main.
   Called from call_demo.i:23.
 [eva] Recording results for oper
diff --git a/tests/slicing/oracle/callwise.res.oracle b/tests/slicing/oracle/callwise.res.oracle
index 8ee91a615776197f6914bebd5ee87dacc32263aa..d9140a749e2efe5eaeb4c62bef86f0b51e91b74c 100644
--- a/tests/slicing/oracle/callwise.res.oracle
+++ b/tests/slicing/oracle/callwise.res.oracle
@@ -70,7 +70,7 @@
 [from] Computing for function fs163_f
 [from] Done for function fs163_f
 [eva] Done for function fs163_f
-[eva] callwise.i:29: starting to merge loop iterations
+[eva:partition] callwise.i:29: starting to merge loop iterations
 [eva] computing for function fs163_f <- fs163_main <- main.
   Called from callwise.i:30.
 [eva] Recording results for fs163_f
diff --git a/tests/slicing/oracle/csmith.0.res.oracle b/tests/slicing/oracle/csmith.0.res.oracle
index 295eb326ffcf0183ad08391d98a48be0e440a49f..be755594b6526a217515158c3342d9da9b96a290 100644
--- a/tests/slicing/oracle/csmith.0.res.oracle
+++ b/tests/slicing/oracle/csmith.0.res.oracle
@@ -45,7 +45,7 @@
 [eva] Done for function bts879b
 [eva] computing for function bts899 <- main.
   Called from csmith.i:243.
-[eva] csmith.i:135: starting to merge loop iterations
+[eva:partition] csmith.i:135: starting to merge loop iterations
 [eva:alarm] csmith.i:141: Warning: signed overflow. assert x + 1 ≤ 2147483647;
 [eva] Recording results for bts899
 [eva] Done for function bts899
@@ -54,8 +54,8 @@
                    (tmp_5 from bts899())
 [eva] computing for function bts906 <- main.
   Called from csmith.i:244.
-[eva] csmith.i:149: starting to merge loop iterations
-[eva] csmith.i:150: starting to merge loop iterations
+[eva:partition] csmith.i:149: starting to merge loop iterations
+[eva:partition] csmith.i:150: starting to merge loop iterations
 [eva] Recording results for bts906
 [eva] Done for function bts906
 [eva:alarm] csmith.i:244: Warning: 
@@ -63,8 +63,8 @@
                    (tmp_6 from bts906())
 [eva] computing for function bts906b <- main.
   Called from csmith.i:245.
-[eva] csmith.i:168: starting to merge loop iterations
-[eva] csmith.i:169: starting to merge loop iterations
+[eva:partition] csmith.i:168: starting to merge loop iterations
+[eva:partition] csmith.i:169: starting to merge loop iterations
 [eva] Recording results for bts906b
 [eva] Done for function bts906b
 [eva:alarm] csmith.i:245: Warning: 
@@ -72,7 +72,7 @@
                    (tmp_7 from bts906b())
 [eva] computing for function bts963 <- main.
   Called from csmith.i:247.
-[eva] csmith.i:211: starting to merge loop iterations
+[eva:partition] csmith.i:211: starting to merge loop iterations
 [eva] Recording results for bts963
 [eva] Done for function bts963
 [eva:alarm] csmith.i:247: Warning: 
@@ -80,7 +80,7 @@
                    (tmp_8 from bts963())
 [eva] computing for function bts963b <- main.
   Called from csmith.i:248.
-[eva] csmith.i:223: starting to merge loop iterations
+[eva:partition] csmith.i:223: starting to merge loop iterations
 [eva] Recording results for bts963b
 [eva] Done for function bts963b
 [eva:alarm] csmith.i:248: Warning: 
diff --git a/tests/slicing/oracle/csmith.1.res.oracle b/tests/slicing/oracle/csmith.1.res.oracle
index 4b6f0d9b8f236c7434f884ff9e3e521ff51abff7..2e2d83f7f3ad81da72610b3618a365551fa8770a 100644
--- a/tests/slicing/oracle/csmith.1.res.oracle
+++ b/tests/slicing/oracle/csmith.1.res.oracle
@@ -6,8 +6,8 @@
   G1 ∈ {0}
   G1b ∈ {0}
   G2 ∈ {0}
-[eva] csmith.i:168: starting to merge loop iterations
-[eva] csmith.i:169: starting to merge loop iterations
+[eva:partition] csmith.i:168: starting to merge loop iterations
+[eva:partition] csmith.i:169: starting to merge loop iterations
 [eva] Recording results for bts906b
 [eva] Done for function bts906b
 [pdg] computing for function bts906b
diff --git a/tests/slicing/oracle/csmith.2.res.oracle b/tests/slicing/oracle/csmith.2.res.oracle
index cb88caa67b829e65f0ef9357c126f58d5ca79756..be9e4354f5c2be8acc1a8c4afcb97fbcf165df2a 100644
--- a/tests/slicing/oracle/csmith.2.res.oracle
+++ b/tests/slicing/oracle/csmith.2.res.oracle
@@ -6,8 +6,8 @@
   G1 ∈ {0}
   G1b ∈ {0}
   G2 ∈ {0}
-[eva] csmith.i:189: starting to merge loop iterations
-[eva] csmith.i:190: starting to merge loop iterations
+[eva:partition] csmith.i:189: starting to merge loop iterations
+[eva:partition] csmith.i:190: starting to merge loop iterations
 [eva] Recording results for bts906c
 [eva] Done for function bts906c
 [pdg] computing for function bts906c
diff --git a/tests/slicing/oracle/forall_loop_invariant.res.oracle b/tests/slicing/oracle/forall_loop_invariant.res.oracle
index 6ae3838a4a3ea8c7a67ebfb5bd50465ca3b62655..9c9fab30299ee870a6de53a430e981a4defc500b 100644
--- a/tests/slicing/oracle/forall_loop_invariant.res.oracle
+++ b/tests/slicing/oracle/forall_loop_invariant.res.oracle
@@ -9,7 +9,7 @@
 [eva] forall_loop_invariant.i:10: loop invariant got status valid.
 [eva] forall_loop_invariant.i:11: loop invariant got status valid.
 [eva] forall_loop_invariant.i:12: loop invariant got status valid.
-[eva] forall_loop_invariant.i:14: starting to merge loop iterations
+[eva:partition] forall_loop_invariant.i:14: starting to merge loop iterations
 [eva:alarm] forall_loop_invariant.i:11: Warning: 
   loop invariant got status unknown.
 [eva:alarm] forall_loop_invariant.i:12: Warning: 
diff --git a/tests/slicing/oracle/horwitz.res.oracle b/tests/slicing/oracle/horwitz.res.oracle
index 82663aa59e4ca74da1e0ce020c5e22b2e85eda95..fb1ac4790f7fe146f0dff60392c08a62c077685c 100644
--- a/tests/slicing/oracle/horwitz.res.oracle
+++ b/tests/slicing/oracle/horwitz.res.oracle
@@ -20,7 +20,7 @@
 [eva] Done for function incr
 [eva] Recording results for A
 [eva] Done for function A
-[eva] horwitz.i:26: starting to merge loop iterations
+[eva:partition] horwitz.i:26: starting to merge loop iterations
 [eva] computing for function A <- main.
   Called from horwitz.i:27.
 [eva] computing for function add <- A <- main.
diff --git a/tests/slicing/oracle/if_many_values.res.oracle b/tests/slicing/oracle/if_many_values.res.oracle
index 7aab4ae30487d71648e13c0b3019ae7fd774aa27..76d39dae06a1d73dfce2b738ea2e6a3a457fbc63 100644
--- a/tests/slicing/oracle/if_many_values.res.oracle
+++ b/tests/slicing/oracle/if_many_values.res.oracle
@@ -5,8 +5,9 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   r ∈ {1}
-[eva] if_many_values.i:8: Trace partitioning superposing up to 100 states
-[eva] if_many_values.i:8: starting to merge loop iterations
+[eva:partition] if_many_values.i:8: 
+  Trace partitioning superposing up to 100 states
+[eva:partition] if_many_values.i:8: starting to merge loop iterations
 [eva:alarm] if_many_values.i:11: Warning: 
   signed overflow. assert r + 1 ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/slicing/oracle/keep_annot.0.res.oracle b/tests/slicing/oracle/keep_annot.0.res.oracle
index 3fb1a5f9a13f4dd6660a54adb54054bc9a44e05e..aa58412131aba23839006a65119dac94d8b5df2f 100644
--- a/tests/slicing/oracle/keep_annot.0.res.oracle
+++ b/tests/slicing/oracle/keep_annot.0.res.oracle
@@ -7,7 +7,7 @@
   
 [eva] computing for function g <- f.
   Called from keep_annot.i:26.
-[eva] keep_annot.i:15: starting to merge loop iterations
+[eva:partition] keep_annot.i:15: starting to merge loop iterations
 [eva:alarm] keep_annot.i:20: Warning: assertion got status unknown.
 [eva:alarm] keep_annot.i:21: Warning: assertion got status unknown.
 [eva] Recording results for g
diff --git a/tests/slicing/oracle/keep_annot.1.res.oracle b/tests/slicing/oracle/keep_annot.1.res.oracle
index 5cc3e4c67b91536c6d402a64add7518b3c3c6955..d44b05938b5702faea44e7cd1f3a04e92557e7bb 100644
--- a/tests/slicing/oracle/keep_annot.1.res.oracle
+++ b/tests/slicing/oracle/keep_annot.1.res.oracle
@@ -7,7 +7,7 @@
   
 [eva] computing for function g <- f.
   Called from keep_annot.i:26.
-[eva] keep_annot.i:15: starting to merge loop iterations
+[eva:partition] keep_annot.i:15: starting to merge loop iterations
 [eva:alarm] keep_annot.i:20: Warning: assertion got status unknown.
 [eva:alarm] keep_annot.i:21: Warning: assertion got status unknown.
 [eva] Recording results for g
diff --git a/tests/slicing/oracle/loop_simple.res.oracle b/tests/slicing/oracle/loop_simple.res.oracle
index ea36836deed923676461a7c6eabcd924a84eb2a9..840f60b8dba4f73eea3906d2b7fd830acb63c437 100644
--- a/tests/slicing/oracle/loop_simple.res.oracle
+++ b/tests/slicing/oracle/loop_simple.res.oracle
@@ -4,8 +4,8 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_simple.i:10: starting to merge loop iterations
-[eva] loop_simple.i:12: starting to merge loop iterations
+[eva:partition] loop_simple.i:10: starting to merge loop iterations
+[eva:partition] loop_simple.i:12: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [from] Computing for function main
diff --git a/tests/slicing/oracle/loops.0.res.oracle b/tests/slicing/oracle/loops.0.res.oracle
index 195fb9c2e96c8456f15003c9e6cb5f432692faae..f00f0cdc1e8038b5048e61e506deaa966ef45896 100644
--- a/tests/slicing/oracle/loops.0.res.oracle
+++ b/tests/slicing/oracle/loops.0.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva] loops.i:36: assertion got status valid.
-[eva] loops.i:34: starting to merge loop iterations
+[eva:partition] loops.i:34: starting to merge loop iterations
 [eva:alarm] loops.i:35: Warning: signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for f1
 [eva] Done for function f1
diff --git a/tests/slicing/oracle/loops.1.res.oracle b/tests/slicing/oracle/loops.1.res.oracle
index 51ca636cfd3d00fb69e740cc7c5ad858c845f3c1..aa185d9c4ab1eaa1788b42c6855b085d1714bcc0 100644
--- a/tests/slicing/oracle/loops.1.res.oracle
+++ b/tests/slicing/oracle/loops.1.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva] loops.i:36: assertion got status valid.
-[eva] loops.i:34: starting to merge loop iterations
+[eva:partition] loops.i:34: starting to merge loop iterations
 [eva:alarm] loops.i:35: Warning: signed overflow. assert s + 1 ≤ 2147483647;
 [eva] Recording results for f1
 [eva] Done for function f1
diff --git a/tests/slicing/oracle/loops.10.res.oracle b/tests/slicing/oracle/loops.10.res.oracle
index ad29d5d345d6cdfb451177128ad492f76e582290..0b25b7d1297a5d9b2629e7fa5b47a17a8d98ccc1 100644
--- a/tests/slicing/oracle/loops.10.res.oracle
+++ b/tests/slicing/oracle/loops.10.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.11.res.oracle b/tests/slicing/oracle/loops.11.res.oracle
index 017f79be1e429c2f17834f7e222be5b2d1e54e46..f0fa7f07cdd2cb810801ab577f4eef782318c134 100644
--- a/tests/slicing/oracle/loops.11.res.oracle
+++ b/tests/slicing/oracle/loops.11.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.12.res.oracle b/tests/slicing/oracle/loops.12.res.oracle
index 5b464448a4e655892f150d74bf75bd39bc918e61..2f876ab222e4cec7301adebec3fee954c2fe509d 100644
--- a/tests/slicing/oracle/loops.12.res.oracle
+++ b/tests/slicing/oracle/loops.12.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.13.res.oracle b/tests/slicing/oracle/loops.13.res.oracle
index 989df21adb3e464f0ea941efed4593e888962e54..e3f14511d63dde5dd4870c6f56624feeb0e8f313 100644
--- a/tests/slicing/oracle/loops.13.res.oracle
+++ b/tests/slicing/oracle/loops.13.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.14.res.oracle b/tests/slicing/oracle/loops.14.res.oracle
index f00541a8e9aed06c125d7caa7488f043dfcfd848..1c7568cc484a69bee1cb4383b73f0e60bd674eec 100644
--- a/tests/slicing/oracle/loops.14.res.oracle
+++ b/tests/slicing/oracle/loops.14.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.15.res.oracle b/tests/slicing/oracle/loops.15.res.oracle
index 75786cb22209a05b389a47ced5a2d9962108c915..68c4e6ea61e5fc050c8a12bb769428a4c0ced75d 100644
--- a/tests/slicing/oracle/loops.15.res.oracle
+++ b/tests/slicing/oracle/loops.15.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva] loops.i:68: assertion got status valid.
-[eva] loops.i:66: starting to merge loop iterations
+[eva:partition] loops.i:66: starting to merge loop iterations
 [kernel:annot:missing-spec] loops.i:70: Warning: 
   Neither code nor specification for function stop,
    generating default assigns. See -generated-spec-* options for more info
diff --git a/tests/slicing/oracle/loops.16.res.oracle b/tests/slicing/oracle/loops.16.res.oracle
index 5d4fe926d54fd6c5ae44a737db8e2b65b8d5677b..97687bd35dcc0f8df763c7e2a14d329b80a48fef 100644
--- a/tests/slicing/oracle/loops.16.res.oracle
+++ b/tests/slicing/oracle/loops.16.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva] loops.i:68: assertion got status valid.
-[eva] loops.i:66: starting to merge loop iterations
+[eva:partition] loops.i:66: starting to merge loop iterations
 [kernel:annot:missing-spec] loops.i:70: Warning: 
   Neither code nor specification for function stop,
    generating default assigns. See -generated-spec-* options for more info
diff --git a/tests/slicing/oracle/loops.19.res.oracle b/tests/slicing/oracle/loops.19.res.oracle
index 0998264ade13e755871e320c9cd50baadbcf6c06..4fd52276c964ec2072a828530e9781a01e0053ba 100644
--- a/tests/slicing/oracle/loops.19.res.oracle
+++ b/tests/slicing/oracle/loops.19.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.2.res.oracle b/tests/slicing/oracle/loops.2.res.oracle
index 94dc22805ddea1052a9acfcf2635bc5c9fca0f77..5e0f770bf3140e140e6f90aad1816ee81ed016bb 100644
--- a/tests/slicing/oracle/loops.2.res.oracle
+++ b/tests/slicing/oracle/loops.2.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva:alarm] loops.i:56: Warning: assertion got status unknown.
-[eva] loops.i:50: starting to merge loop iterations
+[eva:partition] loops.i:50: starting to merge loop iterations
 [eva:alarm] loops.i:52: Warning: signed overflow. assert x1 + 1 ≤ 2147483647;
 [eva:alarm] loops.i:54: Warning: signed overflow. assert x2 + 1 ≤ 2147483647;
 [eva] Recording results for f2
diff --git a/tests/slicing/oracle/loops.20.res.oracle b/tests/slicing/oracle/loops.20.res.oracle
index 6e18bd872d2d86d795df7d8d77af2cc984dd6a76..cc4a302c4f7a28a4f0b1ccd00aa03cae1d52774f 100644
--- a/tests/slicing/oracle/loops.20.res.oracle
+++ b/tests/slicing/oracle/loops.20.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.21.res.oracle b/tests/slicing/oracle/loops.21.res.oracle
index 198ab85fd7052d832b28ad3086ba799a20c0a70d..4493aa02db3a5754c0bb55b348db17a18e5994df 100644
--- a/tests/slicing/oracle/loops.21.res.oracle
+++ b/tests/slicing/oracle/loops.21.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.22.res.oracle b/tests/slicing/oracle/loops.22.res.oracle
index f3b6ac451e581cef7cea08755adc97fd14d61819..5bf53875e1dbe614d7818897a2dfcaf996f1797e 100644
--- a/tests/slicing/oracle/loops.22.res.oracle
+++ b/tests/slicing/oracle/loops.22.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.23.res.oracle b/tests/slicing/oracle/loops.23.res.oracle
index ae8f97a78fc3c8b783c571ad7895d4ad8ea25d81..d2ec1471f8ac88837947e013ef2bd9fb0abad80a 100644
--- a/tests/slicing/oracle/loops.23.res.oracle
+++ b/tests/slicing/oracle/loops.23.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.3.res.oracle b/tests/slicing/oracle/loops.3.res.oracle
index efb7e0e1957e483b70958b7919c2eba5df4b18df..5893f586118518b19e8c54d0b9a9ad4f059c6090 100644
--- a/tests/slicing/oracle/loops.3.res.oracle
+++ b/tests/slicing/oracle/loops.3.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ [--..--]
   Z ∈ [--..--]
 [eva:alarm] loops.i:56: Warning: assertion got status unknown.
-[eva] loops.i:50: starting to merge loop iterations
+[eva:partition] loops.i:50: starting to merge loop iterations
 [eva:alarm] loops.i:52: Warning: signed overflow. assert x1 + 1 ≤ 2147483647;
 [eva:alarm] loops.i:54: Warning: signed overflow. assert x2 + 1 ≤ 2147483647;
 [eva] Recording results for f2
diff --git a/tests/slicing/oracle/loops.5.res.oracle b/tests/slicing/oracle/loops.5.res.oracle
index 3dbe1ba43ebd0c1312410f05f42b9fc7de7da005..422db0f3b9834dd50485d7a26276ef48757616d4 100644
--- a/tests/slicing/oracle/loops.5.res.oracle
+++ b/tests/slicing/oracle/loops.5.res.oracle
@@ -13,7 +13,7 @@
   signed overflow. assert -2147483648 ≤ G + data2;
 [eva:alarm] loops.i:141: Warning: 
   signed overflow. assert G + data2 ≤ 2147483647;
-[eva] loops.i:125: starting to merge loop iterations
+[eva:partition] loops.i:125: starting to merge loop iterations
 [eva:alarm] loops.i:126: Warning: 
   signed overflow. assert -2147483648 ≤ G + data1;
 [eva:alarm] loops.i:126: Warning: 
diff --git a/tests/slicing/oracle/loops.6.res.oracle b/tests/slicing/oracle/loops.6.res.oracle
index 79b46aed029f302595b703e6cd2cfec2a474efc0..73708d5ac606b3fb1d04688f1a976e1f5d538bd9 100644
--- a/tests/slicing/oracle/loops.6.res.oracle
+++ b/tests/slicing/oracle/loops.6.res.oracle
@@ -13,7 +13,7 @@
   signed overflow. assert -2147483648 ≤ G + data2;
 [eva:alarm] loops.i:165: Warning: 
   signed overflow. assert G + data2 ≤ 2147483647;
-[eva] loops.i:149: starting to merge loop iterations
+[eva:partition] loops.i:149: starting to merge loop iterations
 [eva:alarm] loops.i:150: Warning: 
   signed overflow. assert -2147483648 ≤ G + data1;
 [eva:alarm] loops.i:150: Warning: 
diff --git a/tests/slicing/oracle/loops.7.res.oracle b/tests/slicing/oracle/loops.7.res.oracle
index 868002c572703c3a94186a33b2b2a2f7ae4cf95d..1badedf77846dc654e0d005cc090025d8b453ebe 100644
--- a/tests/slicing/oracle/loops.7.res.oracle
+++ b/tests/slicing/oracle/loops.7.res.oracle
@@ -10,7 +10,7 @@
   Y ∈ {0}
   Z ∈ {0}
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.8.res.oracle b/tests/slicing/oracle/loops.8.res.oracle
index f1d9bbd86696821f18cab14e3276c13346963cb5..7c38042f19be50e98bae5df76e79e2882ffa86d3 100644
--- a/tests/slicing/oracle/loops.8.res.oracle
+++ b/tests/slicing/oracle/loops.8.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/loops.9.res.oracle b/tests/slicing/oracle/loops.9.res.oracle
index 6710802f89bf6f9b341dafd9282b5297f1fd57cb..a7414e7695387041c05c42e2ae24bbe3ca5ccf47 100644
--- a/tests/slicing/oracle/loops.9.res.oracle
+++ b/tests/slicing/oracle/loops.9.res.oracle
@@ -19,7 +19,7 @@
 [eva] computing for function loop <- main.
   Called from loops.i:202.
 [eva] loops.i:183: assertion got status valid.
-[eva] loops.i:176: starting to merge loop iterations
+[eva:partition] loops.i:176: starting to merge loop iterations
 [eva:alarm] loops.i:179: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva] Recording results for loop
 [eva] Done for function loop
diff --git a/tests/slicing/oracle/select_simple.res.oracle b/tests/slicing/oracle/select_simple.res.oracle
index 153896afaee2555503b2c63f8d61e955bcbcf1c4..e35c0c3bb405c32404118fd8d8c70f9a05aaec29 100644
--- a/tests/slicing/oracle/select_simple.res.oracle
+++ b/tests/slicing/oracle/select_simple.res.oracle
@@ -10,14 +10,14 @@
   S2 ∈ {0}
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert -2147483648 ≤ uninit - 1;
-[eva] simple_intra_slice.i:98: starting to merge loop iterations
+[eva:partition] simple_intra_slice.i:98: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert -2147483648 ≤ Unknown - 1;
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert Unknown + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.i:101: Warning: 
   signed overflow. assert -2147483648 ≤ uninit2 - 1;
-[eva] simple_intra_slice.i:100: starting to merge loop iterations
+[eva:partition] simple_intra_slice.i:100: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.i:101: Warning: 
   signed overflow. assert S.a + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.i:101: Warning: 
diff --git a/tests/slicing/oracle/simple_intra_slice.res.oracle b/tests/slicing/oracle/simple_intra_slice.res.oracle
index 1c18f00ad9d7f7a3fe81f60b0915a8912e7d912c..1d9e3370f8db8ddb30acbb8f9fb3a37933a829af 100644
--- a/tests/slicing/oracle/simple_intra_slice.res.oracle
+++ b/tests/slicing/oracle/simple_intra_slice.res.oracle
@@ -10,14 +10,14 @@
   S2 ∈ {0}
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert -2147483648 ≤ uninit - 1;
-[eva] simple_intra_slice.i:98: starting to merge loop iterations
+[eva:partition] simple_intra_slice.i:98: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert -2147483648 ≤ Unknown - 1;
 [eva:alarm] simple_intra_slice.i:99: Warning: 
   signed overflow. assert Unknown + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.i:101: Warning: 
   signed overflow. assert -2147483648 ≤ uninit2 - 1;
-[eva] simple_intra_slice.i:100: starting to merge loop iterations
+[eva:partition] simple_intra_slice.i:100: starting to merge loop iterations
 [eva:alarm] simple_intra_slice.i:101: Warning: 
   signed overflow. assert S.a + 1 ≤ 2147483647;
 [eva:alarm] simple_intra_slice.i:101: Warning: 
diff --git a/tests/slicing/oracle/top.0.res.oracle b/tests/slicing/oracle/top.0.res.oracle
index ed9c2f23149bfd5c3d30e255761990de1aab0d8b..5836a008c5d38371847449663ff5a9669e5ae48e 100644
--- a/tests/slicing/oracle/top.0.res.oracle
+++ b/tests/slicing/oracle/top.0.res.oracle
@@ -10,7 +10,7 @@
 [eva] computing for function strlen <- main.
   Called from top.i:27.
 [eva:alarm] top.i:21: Warning: out of bounds read. assert \valid_read(q);
-[eva] top.i:21: starting to merge loop iterations
+[eva:partition] top.i:21: starting to merge loop iterations
 [eva:alarm] top.i:21: Warning: signed overflow. assert k + 1 ≤ 2147483647;
 [eva] Recording results for strlen
 [eva] Done for function strlen
diff --git a/tests/slicing/oracle/top.1.res.oracle b/tests/slicing/oracle/top.1.res.oracle
index 8279a90c0fa054bc6f09f382277d4c7fe91e64a5..318041ead2cff3cd1abb18411fb4b6894d217690 100644
--- a/tests/slicing/oracle/top.1.res.oracle
+++ b/tests/slicing/oracle/top.1.res.oracle
@@ -10,7 +10,7 @@
 [eva] computing for function strlen <- main.
   Called from top.i:27.
 [eva:alarm] top.i:21: Warning: out of bounds read. assert \valid_read(q);
-[eva] top.i:21: starting to merge loop iterations
+[eva:partition] top.i:21: starting to merge loop iterations
 [eva:alarm] top.i:21: Warning: signed overflow. assert k + 1 ≤ 2147483647;
 [eva] Recording results for strlen
 [eva] Done for function strlen
diff --git a/tests/slicing/oracle/top.2.res.oracle b/tests/slicing/oracle/top.2.res.oracle
index 1318e8f4296ce4a66256e614760790880c69cffb..da25ee480e2f11e8df7e91f0e90a1ad025b79864 100644
--- a/tests/slicing/oracle/top.2.res.oracle
+++ b/tests/slicing/oracle/top.2.res.oracle
@@ -10,7 +10,7 @@
 [eva] computing for function strlen <- main.
   Called from top.i:27.
 [eva:alarm] top.i:21: Warning: out of bounds read. assert \valid_read(q);
-[eva] top.i:21: starting to merge loop iterations
+[eva:partition] top.i:21: starting to merge loop iterations
 [eva:alarm] top.i:21: Warning: signed overflow. assert k + 1 ≤ 2147483647;
 [eva] Recording results for strlen
 [eva] Done for function strlen
diff --git a/tests/slicing/oracle/unravel-flavors.0.res.oracle b/tests/slicing/oracle/unravel-flavors.0.res.oracle
index 9e74fb164a5a63cc7ad12e92e361720fe5b30f93..4703eba31787f0c72a450ac8d75729f02adcb136 100644
--- a/tests/slicing/oracle/unravel-flavors.0.res.oracle
+++ b/tests/slicing/oracle/unravel-flavors.0.res.oracle
@@ -44,7 +44,7 @@
   signed overflow. assert -2147483648 ≤ red * green;
 [eva:alarm] unravel-flavors.i:52: Warning: 
   signed overflow. assert red * green ≤ 2147483647;
-[eva] unravel-flavors.i:54: starting to merge loop iterations
+[eva:partition] unravel-flavors.i:54: starting to merge loop iterations
 [eva:alarm] unravel-flavors.i:55: Warning: 
   signed overflow. assert -2147483648 ≤ sour + green;
 [eva:alarm] unravel-flavors.i:55: Warning: 
diff --git a/tests/slicing/oracle/unravel-flavors.1.res.oracle b/tests/slicing/oracle/unravel-flavors.1.res.oracle
index f16981aa5190127039b88f0addd54103c6223579..aa8aef834e494ae042222f03386b391f33004eb6 100644
--- a/tests/slicing/oracle/unravel-flavors.1.res.oracle
+++ b/tests/slicing/oracle/unravel-flavors.1.res.oracle
@@ -44,7 +44,7 @@
   signed overflow. assert -2147483648 ≤ red * green;
 [eva:alarm] unravel-flavors.i:52: Warning: 
   signed overflow. assert red * green ≤ 2147483647;
-[eva] unravel-flavors.i:54: starting to merge loop iterations
+[eva:partition] unravel-flavors.i:54: starting to merge loop iterations
 [eva:alarm] unravel-flavors.i:55: Warning: 
   signed overflow. assert -2147483648 ≤ sour + green;
 [eva:alarm] unravel-flavors.i:55: Warning: 
diff --git a/tests/slicing/oracle/unravel-flavors.2.res.oracle b/tests/slicing/oracle/unravel-flavors.2.res.oracle
index a8135ee708771ca78a171d66ef670fc1c381e99b..288b25e3e484f7f19e1cd14caf248a7b78e28c57 100644
--- a/tests/slicing/oracle/unravel-flavors.2.res.oracle
+++ b/tests/slicing/oracle/unravel-flavors.2.res.oracle
@@ -44,7 +44,7 @@
   signed overflow. assert -2147483648 ≤ red * green;
 [eva:alarm] unravel-flavors.i:52: Warning: 
   signed overflow. assert red * green ≤ 2147483647;
-[eva] unravel-flavors.i:54: starting to merge loop iterations
+[eva:partition] unravel-flavors.i:54: starting to merge loop iterations
 [eva:alarm] unravel-flavors.i:55: Warning: 
   signed overflow. assert -2147483648 ≤ sour + green;
 [eva:alarm] unravel-flavors.i:55: Warning: 
diff --git a/tests/slicing/oracle/unravel-flavors.3.res.oracle b/tests/slicing/oracle/unravel-flavors.3.res.oracle
index 9a83feb26ecab703c3a44dd68bce6420826dfb93..2824c37a555ac52b609ebb61f7132aa89ac83611 100644
--- a/tests/slicing/oracle/unravel-flavors.3.res.oracle
+++ b/tests/slicing/oracle/unravel-flavors.3.res.oracle
@@ -44,7 +44,7 @@
   signed overflow. assert -2147483648 ≤ red * green;
 [eva:alarm] unravel-flavors.i:52: Warning: 
   signed overflow. assert red * green ≤ 2147483647;
-[eva] unravel-flavors.i:54: starting to merge loop iterations
+[eva:partition] unravel-flavors.i:54: starting to merge loop iterations
 [eva:alarm] unravel-flavors.i:55: Warning: 
   signed overflow. assert -2147483648 ≤ sour + green;
 [eva:alarm] unravel-flavors.i:55: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.0.res.oracle b/tests/slicing/oracle/unravel-variance.0.res.oracle
index e9aae04102cf11c25c4360d0765e4289e730a57a..55dc28b10cff4d7f69994b6b6f6fc10537bebeb8 100644
--- a/tests/slicing/oracle/unravel-variance.0.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.0.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.1.res.oracle b/tests/slicing/oracle/unravel-variance.1.res.oracle
index 2deb200cd14fa733adb3adaa914f5d8afa878cab..2dcc0d7b5d6b0fd58a732477964843ac42d81fc7 100644
--- a/tests/slicing/oracle/unravel-variance.1.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.1.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.2.res.oracle b/tests/slicing/oracle/unravel-variance.2.res.oracle
index f6734df8ff538b1ce63fbaedd30545ddd52fe50e..e9c1ef6bff848aee71502e5a757f4f4cc6fb40a1 100644
--- a/tests/slicing/oracle/unravel-variance.2.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.2.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.3.res.oracle b/tests/slicing/oracle/unravel-variance.3.res.oracle
index dfb4b2c3bd69eec1ad6d2126ae79b54f4b7c6f85..3d4d567d2523fe25603c049e6b7beda192aad2d1 100644
--- a/tests/slicing/oracle/unravel-variance.3.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.3.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/slicing/oracle/unravel-variance.4.res.oracle b/tests/slicing/oracle/unravel-variance.4.res.oracle
index 60f4918fed83591558a3c37f5878d032927a55cc..f30d11287ac0c6167a238f03700c2affb5d9b4d7 100644
--- a/tests/slicing/oracle/unravel-variance.4.res.oracle
+++ b/tests/slicing/oracle/unravel-variance.4.res.oracle
@@ -23,7 +23,7 @@
   non-finite float value. assert \is_finite(x[i]);
 [eva:alarm] unravel-variance.i:36: Warning: 
   non-finite float value. assert \is_finite(\mul_float(x[i], x[i]));
-[eva] unravel-variance.i:32: starting to merge loop iterations
+[eva:partition] unravel-variance.i:32: starting to merge loop iterations
 [eva] computing for function scanf <- main.
   Called from unravel-variance.i:34.
 [eva] Done for function scanf
@@ -94,7 +94,7 @@
   non-finite float value. assert \is_finite(\sub_float(x[i], avg));
 [eva:alarm] unravel-variance.i:48: Warning: 
   non-finite float value. assert \is_finite(\mul_float(dev, dev));
-[eva] unravel-variance.i:44: starting to merge loop iterations
+[eva:partition] unravel-variance.i:44: starting to merge loop iterations
 [eva:alarm] unravel-variance.i:47: Warning: 
   non-finite float value. assert \is_finite(\add_float(t2, dev));
 [eva:alarm] unravel-variance.i:48: Warning: 
diff --git a/tests/slicing/oracle/use_spec.1.res.oracle b/tests/slicing/oracle/use_spec.1.res.oracle
index a31502ad99e2832eb3faabd36931f827124eb3f2..b1ca4b07028b2107c706608a320d58db806b81f0 100644
--- a/tests/slicing/oracle/use_spec.1.res.oracle
+++ b/tests/slicing/oracle/use_spec.1.res.oracle
@@ -51,11 +51,10 @@
   G2 ∈ {0}
 [eva] computing for function h_slice_2 <- main2.
   Called from use_spec.i:38.
-[eva] using specification for function h_slice_2
+[eva] using specification for function h
 [eva] Done for function h_slice_2
 [eva] computing for function h_slice_1 <- main2.
   Called from use_spec.i:40.
-[eva] using specification for function h_slice_1
 [eva] Done for function h_slice_1
 [eva:alarm] use_spec.i:41: Warning: 
   signed overflow. assert -2147483648 ≤ tmp + G2;
diff --git a/tests/sparecode/oracle/bts324.0.res.oracle b/tests/sparecode/oracle/bts324.0.res.oracle
index 294098788b1112efd6ad3cbd402741077d694276..980e5daafeeac0f2132bd1deb8786c2cc34d3421 100644
--- a/tests/sparecode/oracle/bts324.0.res.oracle
+++ b/tests/sparecode/oracle/bts324.0.res.oracle
@@ -18,7 +18,7 @@
 [eva] using specification for function loop_body
 [eva] bts324.i:11: Warning: no \from part for clause 'assigns i0, o0;'
 [eva] Done for function loop_body
-[eva] bts324.i:21: starting to merge loop iterations
+[eva:partition] bts324.i:21: starting to merge loop iterations
 [eva] computing for function loop_body <- main.
   Called from bts324.i:22.
 [eva] Done for function loop_body
diff --git a/tests/sparecode/oracle/bts324.1.res.oracle b/tests/sparecode/oracle/bts324.1.res.oracle
index 777e5eff8ed7b940466e54e6d754cbfe5eca9f3a..08edb8bad3a52849427a4ecea8c2607c05216908 100644
--- a/tests/sparecode/oracle/bts324.1.res.oracle
+++ b/tests/sparecode/oracle/bts324.1.res.oracle
@@ -18,7 +18,7 @@
 [eva] using specification for function loop_body
 [eva] bts324.i:11: Warning: no \from part for clause 'assigns i0, o0;'
 [eva] Done for function loop_body
-[eva] bts324.i:28: starting to merge loop iterations
+[eva:partition] bts324.i:28: starting to merge loop iterations
 [eva] computing for function loop_body <- main_bis.
   Called from bts324.i:29.
 [eva] Done for function loop_body
diff --git a/tests/sparecode/oracle/bts324.2.res.oracle b/tests/sparecode/oracle/bts324.2.res.oracle
index 38d7bf094e6a21b22c00dedeb4a696ba4c30ba7b..f9473d7383052c8eb9f8a8f3888d58e195b53d47 100644
--- a/tests/sparecode/oracle/bts324.2.res.oracle
+++ b/tests/sparecode/oracle/bts324.2.res.oracle
@@ -18,7 +18,7 @@
 [eva] using specification for function loop_body
 [eva] bts324.i:11: Warning: no \from part for clause 'assigns i0, o0;'
 [eva] Done for function loop_body
-[eva] bts324.i:37: starting to merge loop iterations
+[eva:partition] bts324.i:37: starting to merge loop iterations
 [eva] computing for function loop_body <- main_ter.
   Called from bts324.i:39.
 [eva] Done for function loop_body
diff --git a/tests/sparecode/oracle/bts324_bis.0.res.oracle b/tests/sparecode/oracle/bts324_bis.0.res.oracle
index 963ffef256f113f018d6065d9a99bb8e43372599..02a0d0fe009ec6c589a81349d0caaaab75c1b54b 100644
--- a/tests/sparecode/oracle/bts324_bis.0.res.oracle
+++ b/tests/sparecode/oracle/bts324_bis.0.res.oracle
@@ -34,7 +34,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts324_bis.i:39: starting to merge loop iterations
+[eva:partition] bts324_bis.i:39: starting to merge loop iterations
 [eva] computing for function loop_body <- main.
   Called from bts324_bis.i:40.
 [eva] computing for function f <- loop_body <- main.
diff --git a/tests/sparecode/oracle/bts324_bis.1.res.oracle b/tests/sparecode/oracle/bts324_bis.1.res.oracle
index ac38ed261635f02cc1749ea5f96e410dc2d1e8cf..81a70879b00ea96c033dc47015df72aa9f821b92 100644
--- a/tests/sparecode/oracle/bts324_bis.1.res.oracle
+++ b/tests/sparecode/oracle/bts324_bis.1.res.oracle
@@ -34,7 +34,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts324_bis.i:52: starting to merge loop iterations
+[eva:partition] bts324_bis.i:52: starting to merge loop iterations
 [eva] computing for function loop_body <- main_bis.
   Called from bts324_bis.i:53.
 [eva] computing for function f <- loop_body <- main_bis.
diff --git a/tests/sparecode/oracle/bts324_bis.2.res.oracle b/tests/sparecode/oracle/bts324_bis.2.res.oracle
index 963ffef256f113f018d6065d9a99bb8e43372599..02a0d0fe009ec6c589a81349d0caaaab75c1b54b 100644
--- a/tests/sparecode/oracle/bts324_bis.2.res.oracle
+++ b/tests/sparecode/oracle/bts324_bis.2.res.oracle
@@ -34,7 +34,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts324_bis.i:39: starting to merge loop iterations
+[eva:partition] bts324_bis.i:39: starting to merge loop iterations
 [eva] computing for function loop_body <- main.
   Called from bts324_bis.i:40.
 [eva] computing for function f <- loop_body <- main.
diff --git a/tests/sparecode/oracle/bts334.0.res.oracle b/tests/sparecode/oracle/bts334.0.res.oracle
index e977ab534d0373b45026dd6611f09a45c128ca81..62c9ca46f75a407ecb37953cc4f6901735272f23 100644
--- a/tests/sparecode/oracle/bts334.0.res.oracle
+++ b/tests/sparecode/oracle/bts334.0.res.oracle
@@ -43,7 +43,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts334.i:53: starting to merge loop iterations
+[eva:partition] bts334.i:53: starting to merge loop iterations
 [eva] computing for function loop_body <- process <- main_init.
   Called from bts334.i:53.
 [eva] computing for function f <- loop_body <- process <- main_init.
diff --git a/tests/sparecode/oracle/bts334.1.res.oracle b/tests/sparecode/oracle/bts334.1.res.oracle
index 2b3b9e693429816b08d6eb31de5f168d17784f65..06bc529abee892df2a4156cdecd0988a4b0ff9b4 100644
--- a/tests/sparecode/oracle/bts334.1.res.oracle
+++ b/tests/sparecode/oracle/bts334.1.res.oracle
@@ -43,7 +43,7 @@
 [eva] Done for function f
 [eva] Recording results for loop_body
 [eva] Done for function loop_body
-[eva] bts334.i:53: starting to merge loop iterations
+[eva:partition] bts334.i:53: starting to merge loop iterations
 [eva] computing for function loop_body <- process <- main_init.
   Called from bts334.i:53.
 [eva] computing for function f <- loop_body <- process <- main_init.
diff --git a/tests/sparecode/oracle/bts334.2.res.oracle b/tests/sparecode/oracle/bts334.2.res.oracle
index 51b356f150a2b2bb88c4fab44d81f06357a47beb..a03e12ab714af782ecd637c6b1a0c54cb27658d8 100644
--- a/tests/sparecode/oracle/bts334.2.res.oracle
+++ b/tests/sparecode/oracle/bts334.2.res.oracle
@@ -48,7 +48,7 @@
 [from] Computing for function loop_body
 [from] Done for function loop_body
 [eva] Done for function loop_body
-[eva] bts334.i:53: starting to merge loop iterations
+[eva:partition] bts334.i:53: starting to merge loop iterations
 [eva] computing for function loop_body <- process <- main_init.
   Called from bts334.i:53.
 [eva] computing for function f <- loop_body <- process <- main_init.
diff --git a/tests/sparecode/oracle/intra.0.res.oracle b/tests/sparecode/oracle/intra.0.res.oracle
index 88889b31a6ebb87782521310d609136c564fb618..48632804a67566bbc402c3d322d98506f0111f5c 100644
--- a/tests/sparecode/oracle/intra.0.res.oracle
+++ b/tests/sparecode/oracle/intra.0.res.oracle
@@ -38,7 +38,7 @@
   Called from intra.i:86.
 [eva] intra.i:64: assertion got status valid.
 [eva] intra.i:65: loop invariant got status valid.
-[eva] intra.i:67: starting to merge loop iterations
+[eva:partition] intra.i:67: starting to merge loop iterations
 [eva] Recording results for loop
 [eva] Done for function loop
 [eva] computing for function assign <- main.
diff --git a/tests/sparecode/oracle/intra.1.res.oracle b/tests/sparecode/oracle/intra.1.res.oracle
index 340b1dc3072098bf7696d0552e94c0fd40938195..fba541e38fe117c482dc602c7dbd790530e1db69 100644
--- a/tests/sparecode/oracle/intra.1.res.oracle
+++ b/tests/sparecode/oracle/intra.1.res.oracle
@@ -37,7 +37,7 @@
   Called from intra.i:86.
 [eva] intra.i:64: assertion got status valid.
 [eva] intra.i:65: loop invariant got status valid.
-[eva] intra.i:67: starting to merge loop iterations
+[eva:partition] intra.i:67: starting to merge loop iterations
 [eva] Recording results for loop
 [eva] Done for function loop
 [eva] computing for function assign <- main.
diff --git a/tests/spec/oracle/behavior_assert.0.res.oracle b/tests/spec/oracle/behavior_assert.0.res.oracle
index fd95af7ccabe332d8048792813b518d65d7636ed..5dc57ac9a73ed6167395e32ac2e7d9e7e52914b7 100644
--- a/tests/spec/oracle/behavior_assert.0.res.oracle
+++ b/tests/spec/oracle/behavior_assert.0.res.oracle
@@ -15,7 +15,7 @@
 [eva] computing for function g <- main.
   Called from behavior_assert.c:91.
 [eva] behavior_assert.c:30: assertion got status valid.
-[eva] behavior_assert.c:28: starting to merge loop iterations
+[eva:partition] behavior_assert.c:28: starting to merge loop iterations
 [eva] behavior_assert.c:24: 
   function g, behavior be: postcondition got status valid. (Behavior may be inactive, no reduction performed.)
 [eva] Recording results for g
diff --git a/tests/spec/oracle/behavior_assert.1.res.oracle b/tests/spec/oracle/behavior_assert.1.res.oracle
index 761d14da25e38b0667fcb91a6b60b770b9d8e3b8..cbcd1739ea4efd5ae2a8735f2d4ec86aa78b9889 100644
--- a/tests/spec/oracle/behavior_assert.1.res.oracle
+++ b/tests/spec/oracle/behavior_assert.1.res.oracle
@@ -15,7 +15,7 @@
 [eva] computing for function g <- main.
   Called from behavior_assert.c:91.
 [eva] behavior_assert.c:30: assertion got status valid.
-[eva] behavior_assert.c:28: starting to merge loop iterations
+[eva:partition] behavior_assert.c:28: starting to merge loop iterations
 [eva] behavior_assert.c:24: 
   function g, behavior be: postcondition got status valid.
 [eva] Recording results for g
diff --git a/tests/spec/oracle/generalized_check.0.res.oracle b/tests/spec/oracle/generalized_check.0.res.oracle
index e168df66f256871307270637a4940ebbad0cd303..0fb9927aa934253ed3519b9fda6f0dbfd3d2adfe 100644
--- a/tests/spec/oracle/generalized_check.0.res.oracle
+++ b/tests/spec/oracle/generalized_check.0.res.oracle
@@ -14,7 +14,7 @@
   check 'main_p_content_ko' got status unknown.
 [eva:alarm] generalized_check.i:32: Warning: 
   loop invariant 'false_but_preserved' got status invalid.
-[eva] generalized_check.i:35: starting to merge loop iterations
+[eva:partition] generalized_check.i:35: starting to merge loop iterations
 [eva:alarm] generalized_check.i:36: Warning: 
   check 'implied_by_false_invariant' got status invalid.
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/syntax/oracle/Refresh_visitor.res.oracle b/tests/syntax/oracle/Refresh_visitor.res.oracle
index fe89ff6b502d7a1d3a3edf83dbf617ab21ef7a8c..c8c0fc83c92f5299d51f7c1484bf394cb10b2017 100644
--- a/tests/syntax/oracle/Refresh_visitor.res.oracle
+++ b/tests/syntax/oracle/Refresh_visitor.res.oracle
@@ -10,8 +10,8 @@ Start
 [eva] Refresh_visitor.i:24: loop invariant got status valid.
 [eva] Refresh_visitor.i:29: loop invariant got status valid.
 [eva] Refresh_visitor.i:30: loop invariant got status valid.
-[eva] Refresh_visitor.i:32: starting to merge loop iterations
-[eva] Refresh_visitor.i:26: starting to merge loop iterations
+[eva:partition] Refresh_visitor.i:32: starting to merge loop iterations
+[eva:partition] Refresh_visitor.i:26: starting to merge loop iterations
 [eva:alarm] Refresh_visitor.i:14: Warning: 
   function main: postcondition got status unknown.
 [eva] Recording results for main
diff --git a/tests/syntax/oracle/string_concat.res.oracle b/tests/syntax/oracle/string_concat.res.oracle
index 7ed5facee899a0ee3fdd471f2a5f7b445943f818..672e70fb40eaba58c89016436dcab9af7d07a4a7 100644
--- a/tests/syntax/oracle/string_concat.res.oracle
+++ b/tests/syntax/oracle/string_concat.res.oracle
@@ -3,7 +3,7 @@
 [eva:initial-state] Values of globals at initialization
   test[0..65535] ∈ {97}
       [65536] ∈ {0}
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   __retres ∈ {0}
diff --git a/tests/syntax/oracle/unroll_labels.0.res.oracle b/tests/syntax/oracle/unroll_labels.0.res.oracle
index b4bf202e0196a60e2d7f5e338888f790ee8eaa7a..6b2b34c5356f281c9c71f4dd314b7b732ed37635 100644
--- a/tests/syntax/oracle/unroll_labels.0.res.oracle
+++ b/tests/syntax/oracle/unroll_labels.0.res.oracle
@@ -4,10 +4,10 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   foo ∈ [--..--]
-[eva] unroll_labels.i:25: starting to merge loop iterations
-[eva] unroll_labels.i:39: starting to merge loop iterations
-[eva] unroll_labels.i:33: starting to merge loop iterations
-[eva] unroll_labels.i:53: starting to merge loop iterations
+[eva:partition] unroll_labels.i:25: starting to merge loop iterations
+[eva:partition] unroll_labels.i:39: starting to merge loop iterations
+[eva:partition] unroll_labels.i:33: starting to merge loop iterations
+[eva:partition] unroll_labels.i:53: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/syntax/oracle/unroll_visit.res.oracle b/tests/syntax/oracle/unroll_visit.res.oracle
index 4768a2906b4d130538dab116a8c659800c461649..9ce3d2d18b71fef13f98da61b55df6c859668481 100644
--- a/tests/syntax/oracle/unroll_visit.res.oracle
+++ b/tests/syntax/oracle/unroll_visit.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   
 [eva] unroll_visit.i:12: assertion got status valid.
-[eva] unroll_visit.i:10: starting to merge loop iterations
+[eva:partition] unroll_visit.i:10: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/syntax/oracle/wstring_concat.res.oracle b/tests/syntax/oracle/wstring_concat.res.oracle
index a61c7bee287e308d9dd1cfe59e51b31b20da64b5..6f978c9b82ffb7fbe703354fbec0a598938c5757 100644
--- a/tests/syntax/oracle/wstring_concat.res.oracle
+++ b/tests/syntax/oracle/wstring_concat.res.oracle
@@ -3,7 +3,7 @@
 [eva:initial-state] Values of globals at initialization
   test[0..65535] ∈ {97}
       [65536] ∈ {0}
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva] ====== VALUES COMPUTED ======
 [eva:final-states] Values at end of function main:
   __retres ∈ {0}
diff --git a/tests/value/oracle/FP5.res.oracle b/tests/value/oracle/FP5.res.oracle
index 5a7c0dda594b28d756ceda8f031c58777b812a60..bf8ae5840b6daa0be12f1985ae9955b350651603 100644
--- a/tests/value/oracle/FP5.res.oracle
+++ b/tests/value/oracle/FP5.res.oracle
@@ -9,7 +9,7 @@
 [eva:alarm] FP5.i:2: Warning: 
   function main: precondition \valid(c) got status unknown.
 [eva] FP5.i:3: function main: precondition \valid(&a) got status valid.
-[eva] FP5.i:23: starting to merge loop iterations
+[eva:partition] FP5.i:23: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/abs_addr.res.oracle b/tests/value/oracle/abs_addr.res.oracle
index ed36262dd940bcd015d697e61ff8fa2111ba2fd2..7c6e21d70237e4386325e6eae82f989ed6722037 100644
--- a/tests/value/oracle/abs_addr.res.oracle
+++ b/tests/value/oracle/abs_addr.res.oracle
@@ -7,8 +7,8 @@
   AutoTest[0..999] ∈ {0}
 [eva] computing for function TstRomUcmm <- main.
   Called from abs_addr.i:46.
-[eva] abs_addr.i:18: starting to merge loop iterations
-[eva] abs_addr.i:32: starting to merge loop iterations
+[eva:partition] abs_addr.i:18: starting to merge loop iterations
+[eva:partition] abs_addr.i:32: starting to merge loop iterations
 [eva] Recording results for TstRomUcmm
 [eva] Done for function TstRomUcmm
 [eva] Recording results for main
diff --git a/tests/value/oracle/abstract_struct_1.res.oracle b/tests/value/oracle/abstract_struct_1.res.oracle
index bedc671f0e38510a875059308595d51894f1bf43..2701dffd8745b12ec2a7b0a6b39064aad9e13db6 100644
--- a/tests/value/oracle/abstract_struct_1.res.oracle
+++ b/tests/value/oracle/abstract_struct_1.res.oracle
@@ -20,7 +20,7 @@
   S_data_0_S_repositories[bits 0 to ..] ∈ [--..--] or UNINITIALIZED
   S_data_1_S_repositories[bits 0 to ..] ∈ [--..--] or UNINITIALIZED
 [eva] abstract_struct_1.c:13: Call to builtin calloc
-[eva] abstract_struct_1.c:13: allocating variable __calloc_main_l13
+[eva:malloc:new] abstract_struct_1.c:13: allocating variable __calloc_main_l13
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/addr2.res.oracle b/tests/value/oracle/addr2.res.oracle
index 9cab734d542a810777f76ce571611a280308a1be..2553bbc58167b0f6b1b0c8cda6768049d61a6615 100644
--- a/tests/value/oracle/addr2.res.oracle
+++ b/tests/value/oracle/addr2.res.oracle
@@ -6,7 +6,7 @@
   x ∈ {0}
   t[0..12] ∈ {0}
 [eva] addr2.i:19: Frama_C_show_each_F: {0}
-[eva] addr2.i:13: starting to merge loop iterations
+[eva:partition] addr2.i:13: starting to merge loop iterations
 [eva] addr2.i:19: Frama_C_show_each_F: {0; 1}
 [eva] addr2.i:19: Frama_C_show_each_F: {0; 1; 2}
 [eva] addr2.i:19: Frama_C_show_each_F: [0..12]
diff --git a/tests/value/oracle/alias.4.res.oracle b/tests/value/oracle/alias.4.res.oracle
index 45b3de2ebba975a77ecf9723fb47710ceb66aee2..3b44162286db1a19c6d08dfde6e65a2823b9b7d7 100644
--- a/tests/value/oracle/alias.4.res.oracle
+++ b/tests/value/oracle/alias.4.res.oracle
@@ -57,7 +57,7 @@
   U ∈ {0}
   char1 ∈ {0}
   ll1 ∈ {0}
-[eva] alias.i:185: starting to merge loop iterations
+[eva:partition] alias.i:185: starting to merge loop iterations
 [eva:alarm] alias.i:191: Warning: 
   pointer comparison. assert \pointer_comparable((void *)PTR2, (void *)PTR1);
 [eva:alarm] alias.i:199: Warning: signed overflow. assert c + 1 ≤ 2147483647;
diff --git a/tests/value/oracle/alias.5.res.oracle b/tests/value/oracle/alias.5.res.oracle
index 3e2bababd75747492ad08c0aba466a78b17021aa..c4f24dbc8340305f3c5fb821c4f30e6cd69ffd7d 100644
--- a/tests/value/oracle/alias.5.res.oracle
+++ b/tests/value/oracle/alias.5.res.oracle
@@ -127,11 +127,11 @@
 [eva] Done for function f2
 [eva:alarm] alias.i:271: Warning: signed overflow. assert c2 + 1 ≤ 2147483647;
 [eva:alarm] alias.i:273: Warning: signed overflow. assert c2 + 2 ≤ 2147483647;
-[eva] alias.i:279: starting to merge loop iterations
+[eva:partition] alias.i:279: starting to merge loop iterations
 [eva:alarm] alias.i:285: Warning: 
   pointer comparison. assert \pointer_comparable((void *)PTR2, (void *)PTR1);
 [eva:alarm] alias.i:292: Warning: signed overflow. assert c1 + 1 ≤ 2147483647;
-[eva] alias.i:292: starting to merge loop iterations
+[eva:partition] alias.i:292: starting to merge loop iterations
 [eva] Recording results for main11
 [eva] Done for function main11
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/any_int.res.oracle b/tests/value/oracle/any_int.res.oracle
index d372d85ec223a789b4f06d4a642c9a357f5de710..56c3da3692a54bd2620c28e8a6a692948640db6e 100644
--- a/tests/value/oracle/any_int.res.oracle
+++ b/tests/value/oracle/any_int.res.oracle
@@ -7,7 +7,7 @@
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert y + 1 ≤ 2147483647;
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert y + 1 ≤ 2147483647;
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert -2147483648 ≤ y - 1;
-[eva] any_int.c:9: starting to merge loop iterations
+[eva:partition] any_int.c:9: starting to merge loop iterations
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert x + 1 ≤ 2147483647;
 [eva:alarm] any_int.c:9: Warning: signed overflow. assert -2147483648 ≤ x - 1;
 [eva] Recording results for main
diff --git a/tests/value/oracle/array_bounds.0.res.oracle b/tests/value/oracle/array_bounds.0.res.oracle
index 06b7105be5ce5d88c7a0d0c7c92bfad709010859..db715daa6284aeed762c7f4f20f802203d2fa254 100644
--- a/tests/value/oracle/array_bounds.0.res.oracle
+++ b/tests/value/oracle/array_bounds.0.res.oracle
@@ -33,12 +33,12 @@
    .T[11] ∈ {11}
    .b ∈ {20}
 [eva] array_bounds.i:15: Frama_C_show_each: {0}
-[eva] array_bounds.i:14: starting to merge loop iterations
+[eva:partition] array_bounds.i:14: starting to merge loop iterations
 [eva] array_bounds.i:15: Frama_C_show_each: {0; 1}
 [eva] array_bounds.i:15: Frama_C_show_each: {0; 1; 2}
 [eva] array_bounds.i:15: Frama_C_show_each: [0..11]
 [eva] array_bounds.i:15: Frama_C_show_each: [0..11]
-[eva] array_bounds.i:19: starting to merge loop iterations
+[eva:partition] array_bounds.i:19: starting to merge loop iterations
 [eva:alarm] array_bounds.i:20: Warning: 
   accessing out of bounds index. assert j < 12;
 [eva] Recording results for main
diff --git a/tests/value/oracle/array_bounds.1.res.oracle b/tests/value/oracle/array_bounds.1.res.oracle
index 4afd0bfd450b3c101384c3df69ad70c5b3bfe5ae..3f7966b951a478ef2f44496a55c75a22d41a3ab5 100644
--- a/tests/value/oracle/array_bounds.1.res.oracle
+++ b/tests/value/oracle/array_bounds.1.res.oracle
@@ -33,12 +33,12 @@
    .T[11] ∈ {11}
    .b ∈ {20}
 [eva] array_bounds.i:15: Frama_C_show_each: {0}
-[eva] array_bounds.i:14: starting to merge loop iterations
+[eva:partition] array_bounds.i:14: starting to merge loop iterations
 [eva] array_bounds.i:15: Frama_C_show_each: {0; 1}
 [eva] array_bounds.i:15: Frama_C_show_each: {0; 1; 2}
 [eva] array_bounds.i:15: Frama_C_show_each: [0..11]
 [eva] array_bounds.i:15: Frama_C_show_each: [0..11]
-[eva] array_bounds.i:19: starting to merge loop iterations
+[eva:partition] array_bounds.i:19: starting to merge loop iterations
 [eva:alarm] array_bounds.i:19: Warning: 
   signed overflow. assert j + 5 ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/value/oracle/array_degenerating_loop.res.oracle b/tests/value/oracle/array_degenerating_loop.res.oracle
index 92469746912140243f24f29f98a993ec17a9caf4..61ea24cc72278d6d9f35c4f950332658bc70db79 100644
--- a/tests/value/oracle/array_degenerating_loop.res.oracle
+++ b/tests/value/oracle/array_degenerating_loop.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   t[0..1] ∈ {1}
    [2..99] ∈ {0}
-[eva] array_degenerating_loop.i:8: starting to merge loop iterations
+[eva:partition] array_degenerating_loop.i:8: starting to merge loop iterations
 [eva:alarm] array_degenerating_loop.i:9: Warning: 
   accessing out of bounds index. assert i < 100;
 [eva:alarm] array_degenerating_loop.i:9: Warning: 
diff --git a/tests/value/oracle/array_loop.res.oracle b/tests/value/oracle/array_loop.res.oracle
index 284fe6dad4525a9dfcb9346bc7db5935aafcbc16..767884235486739d1167d65aac4e608c6d038748 100644
--- a/tests/value/oracle/array_loop.res.oracle
+++ b/tests/value/oracle/array_loop.res.oracle
@@ -23,7 +23,7 @@
     [7] ∈ {24}
     [8..17] ∈ {1}
     [18..19] ∈ {0}
-[eva] array_loop.i:7: starting to merge loop iterations
+[eva:partition] array_loop.i:7: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/assigns.res.oracle b/tests/value/oracle/assigns.res.oracle
index 5f6d7ad67fbd51414d5aad503a4495a7dfce64d8..a0290280a5fc1643491abf4785f33b59f681ddb9 100644
--- a/tests/value/oracle/assigns.res.oracle
+++ b/tests/value/oracle/assigns.res.oracle
@@ -31,7 +31,7 @@
   Called from assigns.i:49.
 [eva] using specification for function f
 [eva] Done for function f
-[eva] assigns.i:48: starting to merge loop iterations
+[eva:partition] assigns.i:48: starting to merge loop iterations
 [eva] computing for function f <- main1 <- main.
   Called from assigns.i:49.
 [eva] Done for function f
diff --git a/tests/value/oracle/assigns_from.res.oracle b/tests/value/oracle/assigns_from.res.oracle
index be60cecebede8380f7df749aecdd254fe0bcc968..d992ce375d0077513f53951dbc693f3f071acb04 100644
--- a/tests/value/oracle/assigns_from.res.oracle
+++ b/tests/value/oracle/assigns_from.res.oracle
@@ -193,7 +193,7 @@
   Called from assigns_from.i:152.
 [eva] using specification for function c
 [eva] Done for function c
-[eva] assigns_from.i:152: starting to merge loop iterations
+[eva:partition] assigns_from.i:152: starting to merge loop iterations
 [eva] computing for function c <- main10 <- main.
   Called from assigns_from.i:152.
 [eva] Done for function c
@@ -265,7 +265,7 @@
 [eva] Done for function main13
 [eva] computing for function main14 <- main.
   Called from assigns_from.i:250.
-[eva] assigns_from.i:183: starting to merge loop iterations
+[eva:partition] assigns_from.i:183: starting to merge loop iterations
 [eva] Recording results for main14
 [from] Computing for function main14
 [from] Done for function main14
@@ -275,7 +275,7 @@
 [eva] Done for function main14
 [eva] computing for function main16 <- main.
   Called from assigns_from.i:251.
-[eva] assigns_from.i:188: starting to merge loop iterations
+[eva:partition] assigns_from.i:188: starting to merge loop iterations
 [eva] Recording results for main16
 [from] Computing for function main16
 [from] Done for function main16
@@ -285,7 +285,7 @@
 [eva] Done for function main16
 [eva] computing for function main17 <- main.
   Called from assigns_from.i:252.
-[eva] assigns_from.i:195: starting to merge loop iterations
+[eva:partition] assigns_from.i:195: starting to merge loop iterations
 [eva] Recording results for main17
 [from] Computing for function main17
 [from] Done for function main17
diff --git a/tests/value/oracle/auto_loop_unroll.0.res.oracle b/tests/value/oracle/auto_loop_unroll.0.res.oracle
index 8bc2593b977107a4078f4aa6f8e2bcfd41c6adca..432a17f44aebca89430e0352ddf59994e79d74a9 100644
--- a/tests/value/oracle/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle/auto_loop_unroll.0.res.oracle
@@ -7,37 +7,38 @@
   g ∈ {0}
 [eva] computing for function simple_loops <- main.
   Called from auto_loop_unroll.c:428.
-[eva] auto_loop_unroll.c:24: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:24: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:25: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:27: Frama_C_show_each_auto: [0..2147483647]
-[eva] auto_loop_unroll.c:30: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:30: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:31: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:38: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:38: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:39: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:46: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:46: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:49: Frama_C_show_each_singleton: {100}
 [eva] Recording results for simple_loops
 [eva] Done for function simple_loops
 [eva] computing for function various_loops <- main.
   Called from auto_loop_unroll.c:429.
-[eva] auto_loop_unroll.c:57: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:57: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:58: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: [0..2147483647]
-[eva] auto_loop_unroll.c:62: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:62: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:63: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..2147483647]
-[eva] auto_loop_unroll.c:67: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:67: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:69: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..2147483647]
-[eva] auto_loop_unroll.c:75: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:75: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:76: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..2147483647]
@@ -47,11 +48,11 @@
 [eva] auto_loop_unroll.c:86: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] auto_loop_unroll.c:87: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:87: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:88: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:89: Frama_C_show_each_40_50: [0..2147483647]
-[eva] auto_loop_unroll.c:92: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:92: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:93: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:95: Frama_C_show_each_101: [0..2147483647]
@@ -64,7 +65,7 @@
 [eva] Recording results for incr
 [eva] Done for function incr
 [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
-[eva] auto_loop_unroll.c:98: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:98: starting to merge loop iterations
 [eva] computing for function incr_g <- various_loops <- main.
   Called from auto_loop_unroll.c:99.
 [eva] Recording results for incr_g
@@ -119,20 +120,20 @@
 [eva] Done for function incr
 [eva] auto_loop_unroll.c:103: Frama_C_show_each_25: [0..2147483647]
 [eva:loop-unroll:auto] auto_loop_unroll.c:108: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:107: starting to merge loop iterations
-[eva] auto_loop_unroll.c:108: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:107: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:108: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:109: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:112: Frama_C_show_each_120: [0..2147483647]
-[eva] auto_loop_unroll.c:115: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:115: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:120: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [0..2147483647]
-[eva] auto_loop_unroll.c:125: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:125: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:130: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:132: Frama_C_show_each_1_28: [0..2147483647]
-[eva] auto_loop_unroll.c:134: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:134: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:139: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [0..2147483647]
@@ -140,21 +141,21 @@
 [eva] Done for function various_loops
 [eva] computing for function complex_loops <- main.
   Called from auto_loop_unroll.c:430.
-[eva] auto_loop_unroll.c:152: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:152: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:154: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:156: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:160: starting to merge loop iterations
-[eva] auto_loop_unroll.c:161: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:160: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:161: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:165: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:171: starting to merge loop iterations
-[eva] auto_loop_unroll.c:172: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:171: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:172: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:176: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:183: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:183: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:186: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [0..2147483647]
@@ -162,7 +163,7 @@
   Called from auto_loop_unroll.c:193.
 [eva] Recording results for incr_g
 [eva] Done for function incr_g
-[eva] auto_loop_unroll.c:192: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:192: starting to merge loop iterations
 [eva] computing for function incr_g <- complex_loops <- main.
   Called from auto_loop_unroll.c:193.
 [eva] Recording results for incr_g
@@ -180,11 +181,11 @@
 [eva:alarm] auto_loop_unroll.c:195: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:197: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:202: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:202: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:204: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:210: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:210: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:212: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:211: Warning: 
@@ -194,35 +195,35 @@
 [eva] Done for function complex_loops
 [eva] computing for function various_conditions <- main.
   Called from auto_loop_unroll.c:431.
-[eva] auto_loop_unroll.c:223: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:223: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:224: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: [0..2147483647]
-[eva] auto_loop_unroll.c:228: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:228: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:229: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: [0..2147483647]
-[eva] auto_loop_unroll.c:234: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:234: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:235: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:234: Warning: 
   signed overflow. assert -2147483648 ≤ i_0 - 1;
 [eva] auto_loop_unroll.c:237: Frama_C_show_each_0_13: [0..2147483647]
-[eva] auto_loop_unroll.c:239: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:239: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:240: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:239: Warning: 
   signed overflow. assert -2147483648 ≤ i_1 - 1;
 [eva] auto_loop_unroll.c:242: Frama_C_show_each_0_14: [0..2147483647]
-[eva] auto_loop_unroll.c:245: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:245: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:248: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:250: Frama_C_show_each_0_15: [0..2147483647]
-[eva] auto_loop_unroll.c:252: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:252: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:253: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [0..2147483647]
-[eva] auto_loop_unroll.c:262: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:262: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:263: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [0..2147483647]
@@ -230,31 +231,31 @@
 [eva] Done for function various_conditions
 [eva] computing for function temporary_variables <- main.
   Called from auto_loop_unroll.c:432.
-[eva] auto_loop_unroll.c:274: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:274: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:274: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:275: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [0..2147483647]
-[eva] auto_loop_unroll.c:279: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:279: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:280: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:279: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: [0..2147483647]
-[eva] auto_loop_unroll.c:284: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:284: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:286: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:284: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:288: Frama_C_show_each_22: [0..2147483647]
-[eva] auto_loop_unroll.c:291: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:291: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:294: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:291: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:296: Frama_C_show_each_23: [0..2147483647]
-[eva] auto_loop_unroll.c:299: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:299: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:302: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:299: Warning: 
@@ -264,39 +265,39 @@
 [eva] Done for function temporary_variables
 [eva] computing for function loops_with_goto <- main.
   Called from auto_loop_unroll.c:433.
-[eva] auto_loop_unroll.c:310: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:310: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:311: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: [0..2147483647]
 [eva:alarm] auto_loop_unroll.c:320: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:319: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
 [eva] auto_loop_unroll.c:324: Frama_C_show_each_top: [0..2147483647]
-[eva] auto_loop_unroll.c:327: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:327: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:328: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: [0..2147483647]
 [eva:alarm] auto_loop_unroll.c:337: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:336: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:336: starting to merge loop iterations
 [eva] auto_loop_unroll.c:341: Frama_C_show_each_33_inf: [0..2147483647]
 [eva:alarm] auto_loop_unroll.c:345: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:344: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:344: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:344: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:349: Frama_C_show_each_top: [0..2147483647]
-[eva] auto_loop_unroll.c:352: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:352: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:355: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..2147483647]
-[eva] auto_loop_unroll.c:360: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:360: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:360: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:360: Warning: 
   signed overflow. assert -2147483648 ≤ i - 1;
 [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: [0..2147483647]
-[eva] auto_loop_unroll.c:367: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:367: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:370: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:372: Frama_C_show_each_27: [0..2147483647]
@@ -316,19 +317,19 @@
 [eva] Done for function non_natural_loops
 [eva] computing for function following_loops <- main.
   Called from auto_loop_unroll.c:435.
-[eva] auto_loop_unroll.c:402: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:402: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:404: Warning: 
   signed overflow. assert j + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:408: Warning: 
   signed overflow. assert j + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:406: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:406: starting to merge loop iterations
 [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: [0..2147483647]
-[eva] auto_loop_unroll.c:413: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:413: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:415: Warning: 
   signed overflow. assert j + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:419: Warning: 
   signed overflow. assert j + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:417: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:417: starting to merge loop iterations
 [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [0..2147483647]
 [eva] Recording results for following_loops
 [eva] Done for function following_loops
diff --git a/tests/value/oracle/auto_loop_unroll.1.res.oracle b/tests/value/oracle/auto_loop_unroll.1.res.oracle
index 006afbecfc62bce1626b6286a3c47240997eae5d..26f830368c3f30a6212aa8bbc1fee4ec64d7845b 100644
--- a/tests/value/oracle/auto_loop_unroll.1.res.oracle
+++ b/tests/value/oracle/auto_loop_unroll.1.res.oracle
@@ -8,13 +8,14 @@
 [eva] computing for function simple_loops <- main.
   Called from auto_loop_unroll.c:428.
 [eva:loop-unroll:auto] auto_loop_unroll.c:24: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:24: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:24: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:27: Frama_C_show_each_auto: {100}
-[eva] auto_loop_unroll.c:30: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:30: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:31: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:38: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:38: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:39: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
@@ -30,7 +31,8 @@
 [eva:loop-unroll:auto] auto_loop_unroll.c:67: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: {80}
 [eva:loop-unroll:auto] auto_loop_unroll.c:75: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:75: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:75: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [32..80]
 [eva] computing for function Frama_C_interval <- various_loops <- main.
   Called from auto_loop_unroll.c:86.
@@ -276,7 +278,7 @@
 [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [32..64]
 [eva:loop-unroll:auto] auto_loop_unroll.c:125: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:132: Frama_C_show_each_1_28: [1..28]
-[eva] auto_loop_unroll.c:134: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:134: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:139: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [0..2147483647]
@@ -284,21 +286,21 @@
 [eva] Done for function various_loops
 [eva] computing for function complex_loops <- main.
   Called from auto_loop_unroll.c:430.
-[eva] auto_loop_unroll.c:152: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:152: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:154: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:156: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:160: starting to merge loop iterations
-[eva] auto_loop_unroll.c:161: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:160: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:161: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:165: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:171: starting to merge loop iterations
-[eva] auto_loop_unroll.c:172: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:171: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:172: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:176: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:183: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:183: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:186: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [0..2147483647]
@@ -306,7 +308,7 @@
   Called from auto_loop_unroll.c:193.
 [eva] Recording results for incr_g
 [eva] Done for function incr_g
-[eva] auto_loop_unroll.c:192: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:192: starting to merge loop iterations
 [eva] computing for function incr_g <- complex_loops <- main.
   Called from auto_loop_unroll.c:193.
 [eva] Recording results for incr_g
@@ -324,11 +326,11 @@
 [eva:alarm] auto_loop_unroll.c:195: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:197: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:202: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:202: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:204: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
-[eva] auto_loop_unroll.c:210: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:210: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:212: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:211: Warning: 
@@ -349,7 +351,8 @@
 [eva:loop-unroll:auto] auto_loop_unroll.c:245: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:250: Frama_C_show_each_0_15: [0..15]
 [eva:loop-unroll:auto] auto_loop_unroll.c:252: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:252: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:252: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [11..111]
 [eva:loop-unroll:auto] auto_loop_unroll.c:262: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: {16}
@@ -365,7 +368,7 @@
 [eva] auto_loop_unroll.c:288: Frama_C_show_each_22: {22}
 [eva:loop-unroll:auto] auto_loop_unroll.c:291: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:296: Frama_C_show_each_23: {23}
-[eva] auto_loop_unroll.c:299: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:299: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:302: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva:alarm] auto_loop_unroll.c:299: Warning: 
@@ -378,10 +381,11 @@
 [eva:loop-unroll:auto] auto_loop_unroll.c:310: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: {30}
 [eva:loop-unroll:auto] auto_loop_unroll.c:319: Automatic loop unrolling.
-[eva] auto_loop_unroll.c:319: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:320: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:319: Trace partitioning superposing up to 100 states
+[eva:partition] auto_loop_unroll.c:319: 
+  Trace partitioning superposing up to 100 states
 [eva] auto_loop_unroll.c:324: Frama_C_show_each_top: [31..2147483647]
 [eva:loop-unroll:auto] auto_loop_unroll.c:327: Automatic loop unrolling.
 [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: {32}
@@ -391,7 +395,7 @@
 [eva] auto_loop_unroll.c:341: Frama_C_show_each_33_inf: [33..2147483647]
 [eva:alarm] auto_loop_unroll.c:345: Warning: 
   signed overflow. assert i + 1 ≤ 2147483647;
-[eva] auto_loop_unroll.c:344: starting to merge loop iterations
+[eva:partition] auto_loop_unroll.c:344: starting to merge loop iterations
 [eva:alarm] auto_loop_unroll.c:344: Warning: 
   signed overflow. assert res + 1 ≤ 2147483647;
 [eva] auto_loop_unroll.c:349: Frama_C_show_each_top: [0..2147483647]
diff --git a/tests/value/oracle/bad_loop.res.oracle b/tests/value/oracle/bad_loop.res.oracle
index 98dd94aeb4099f9c907dbc07ee15c6ed171840f4..579252b20f5d88af2ecfea3d1bbd5ee4764cc9dd 100644
--- a/tests/value/oracle/bad_loop.res.oracle
+++ b/tests/value/oracle/bad_loop.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   c ∈ [--..--]
-[eva] bad_loop.i:6: starting to merge loop iterations
+[eva:partition] bad_loop.i:6: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/bitfield.res.oracle b/tests/value/oracle/bitfield.res.oracle
index 13d02bf5face0862115370d911deb7b4db158327..201d37bfdae6eb0f410d786506ee8a80e5357cee 100644
--- a/tests/value/oracle/bitfield.res.oracle
+++ b/tests/value/oracle/bitfield.res.oracle
@@ -118,7 +118,7 @@
   .bitf ∈ {0}
   .[bits 65 to 95] ∈
   {{ garbled mix of &{b} (origin: Misaligned read {bitfield.i:70}) }}
-[eva] bitfield.i:69: starting to merge loop iterations
+[eva:partition] bitfield.i:69: starting to merge loop iterations
 [eva] computing for function leaf <- imprecise_bts_1671 <- main.
   Called from bitfield.i:70.
 [eva] Done for function leaf
diff --git a/tests/value/oracle/branch2.res.oracle b/tests/value/oracle/branch2.res.oracle
index 0a917d9922b916e663c502621a8587244bdb0871..f83396e9d173259669d1b59bec4f9fd511270328 100644
--- a/tests/value/oracle/branch2.res.oracle
+++ b/tests/value/oracle/branch2.res.oracle
@@ -9,7 +9,7 @@
   plein ∈ {0}
   NumFonct ∈ {0}
   NumSsPage ∈ {0}
-[eva] branch2.i:14: starting to merge loop iterations
+[eva:partition] branch2.i:14: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/buffer_overflow.0.res.oracle b/tests/value/oracle/buffer_overflow.0.res.oracle
index 43a3466b7dd85da95d70a64b89e40420c96f9bec..2c1f3b4b750adcee3baa0e975c10f97de814e923 100644
--- a/tests/value/oracle/buffer_overflow.0.res.oracle
+++ b/tests/value/oracle/buffer_overflow.0.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] buffer_overflow.i:15: starting to merge loop iterations
+[eva:partition] buffer_overflow.i:15: starting to merge loop iterations
 [eva:alarm] buffer_overflow.i:18: Warning: 
   accessing out of bounds index. assert loop_counter < 10;
 [eva] Recording results for main
diff --git a/tests/value/oracle/bug0196.res.oracle b/tests/value/oracle/bug0196.res.oracle
index 6c1b298cc4c47a9b745ce3fabe02347857c29b11..72f5d95bf1f1460727fa4dc134a903f93ef6f233 100644
--- a/tests/value/oracle/bug0196.res.oracle
+++ b/tests/value/oracle/bug0196.res.oracle
@@ -9,7 +9,7 @@
 [eva] bug0196.c:8: assertion got status valid.
 [eva] bug0196.c:11: cannot evaluate ACSL term, \at() on a C label is unsupported
 [eva:alarm] bug0196.c:11: Warning: assertion got status unknown.
-[eva] bug0196.c:7: starting to merge loop iterations
+[eva:partition] bug0196.c:7: starting to merge loop iterations
 [eva:alarm] bug0196.c:10: Warning: 
   signed overflow. assert r * tmp ≤ 2147483647;
                    (tmp from n--)
diff --git a/tests/value/oracle/bug_0244.res.oracle b/tests/value/oracle/bug_0244.res.oracle
index 029360c90b638d98ede742bb8cf61bd6ba4bc594..dbdb841666083c3150ed0ab730e20bb0dbe54e5c 100644
--- a/tests/value/oracle/bug_0244.res.oracle
+++ b/tests/value/oracle/bug_0244.res.oracle
@@ -7,7 +7,7 @@
   p ∈ {0}
 [eva:locals-escaping] bug_0244.i:10: Warning: 
   locals {u} escaping the scope of a block of main through p
-[eva] bug_0244.i:7: starting to merge loop iterations
+[eva:partition] bug_0244.i:7: starting to merge loop iterations
 [eva:alarm] bug_0244.i:12: Warning: 
   accessing left-value that contains escaping addresses.
   assert ¬\dangling(&p);
diff --git a/tests/value/oracle/call.res.oracle b/tests/value/oracle/call.res.oracle
index c81599c1696fd0f2b15e0b6e7c4e2e99f82cdf04..c61a564254c4da99bcc3f8f9af06f806e253a69b 100644
--- a/tests/value/oracle/call.res.oracle
+++ b/tests/value/oracle/call.res.oracle
@@ -26,7 +26,7 @@
   Called from call.i:20.
 [eva] using specification for function leaf_fun_charp
 [eva] Done for function leaf_fun_charp
-[eva] call.i:23: starting to merge loop iterations
+[eva:partition] call.i:23: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from call.i:39.
 [eva] Recording results for f
diff --git a/tests/value/oracle/cast.res.oracle b/tests/value/oracle/cast.res.oracle
index 3d7f2bdc46af05d80381e823a9163f5cb5f871d7..e1a20de8e949801eaa818e24bdddb61835cba655 100644
--- a/tests/value/oracle/cast.res.oracle
+++ b/tests/value/oracle/cast.res.oracle
@@ -29,7 +29,7 @@
 [eva] Done for function any_int_4
 [eva] computing for function printf_va_1 <- main1 <- main.
   Called from cast.i:46.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva:alarm] cast.i:46: Warning: 
   function printf_va_1: precondition got status unknown.
 [eva] Done for function printf_va_1
@@ -39,11 +39,10 @@
   Called from cast.i:74.
 [eva] computing for function printf_va_2 <- main2 <- main.
   Called from cast.i:67.
-[eva] using specification for function printf_va_2
 [eva:alarm] cast.i:67: Warning: 
   function printf_va_2: precondition got status unknown.
 [eva] Done for function printf_va_2
-[eva] cast.i:64: starting to merge loop iterations
+[eva:partition] cast.i:64: starting to merge loop iterations
 [eva] computing for function printf_va_2 <- main2 <- main.
   Called from cast.i:67.
 [eva] Done for function printf_va_2
@@ -55,7 +54,6 @@
 [eva] Done for function printf_va_2
 [eva] computing for function printf_va_3 <- main2 <- main.
   Called from cast.i:69.
-[eva] using specification for function printf_va_3
 [eva:alarm] cast.i:69: Warning: 
   function printf_va_3: precondition got status unknown.
 [eva] Done for function printf_va_3
diff --git a/tests/value/oracle/cast1.res.oracle b/tests/value/oracle/cast1.res.oracle
index 0d5e247003ef15fb761c32d1b095baafdc9e65bc..0d585a7e625abcc9598e24c4d817390c159781fe 100644
--- a/tests/value/oracle/cast1.res.oracle
+++ b/tests/value/oracle/cast1.res.oracle
@@ -9,8 +9,8 @@
    [1..4] ∈ {0}
   I[0] ∈ {1}
    [1..4] ∈ {0}
-[eva] cast1.i:7: starting to merge loop iterations
-[eva] cast1.i:8: starting to merge loop iterations
+[eva:partition] cast1.i:7: starting to merge loop iterations
+[eva:partition] cast1.i:8: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/cert_exp35_c.res.oracle b/tests/value/oracle/cert_exp35_c.res.oracle
index b4d301d74c4e6c2f66bcb8188c2945d4f474fe3c..c98fec494d33cfaf6cb37f6c16546b2edd8270b2 100644
--- a/tests/value/oracle/cert_exp35_c.res.oracle
+++ b/tests/value/oracle/cert_exp35_c.res.oracle
@@ -11,7 +11,7 @@
 [eva] Done for function addressee
 [eva] computing for function printf_va_1 <- main.
   Called from cert_exp35_c.i:24.
-[eva] using specification for function printf_va_1
+[eva] using specification for function printf
 [eva:alarm] cert_exp35_c.i:24: Warning: 
   function printf_va_1: precondition valid_read_string(param0) got status unknown.
 [eva:alarm] cert_exp35_c.i:24: Warning: 
diff --git a/tests/value/oracle/cond2.0.res.oracle b/tests/value/oracle/cond2.0.res.oracle
index db0959a71276c4117dca14764ad7410f2c1150f3..79bea542ba1bd19259b62cd1d163514c1dd45160 100644
--- a/tests/value/oracle/cond2.0.res.oracle
+++ b/tests/value/oracle/cond2.0.res.oracle
@@ -14,9 +14,9 @@
   s ∈ {0}
   t ∈ {0}
   u ∈ {0}
-[eva] cond2.i:26: starting to merge loop iterations
+[eva:partition] cond2.i:26: starting to merge loop iterations
 [eva:alarm] cond2.i:26: Warning: signed overflow. assert x + 2 ≤ 2147483647;
-[eva] cond2.i:27: starting to merge loop iterations
+[eva:partition] cond2.i:27: starting to merge loop iterations
 [eva:alarm] cond2.i:27: Warning: signed overflow. assert y + 5 ≤ 2147483647;
 [eva] Recording results for zero_ou_un_0
 [eva] Done for function zero_ou_un_0
diff --git a/tests/value/oracle/cond2.1.res.oracle b/tests/value/oracle/cond2.1.res.oracle
index d8a9fd6e107b523c387aa82afd20241807a95d25..31530dfb6243b06b124672883ee6da0bfbb03ee6 100644
--- a/tests/value/oracle/cond2.1.res.oracle
+++ b/tests/value/oracle/cond2.1.res.oracle
@@ -14,17 +14,17 @@
   s ∈ {0}
   t ∈ {0}
   u ∈ {0}
-[eva] cond2.i:52: starting to merge loop iterations
+[eva:partition] cond2.i:52: starting to merge loop iterations
 [eva:alarm] cond2.i:52: Warning: signed overflow. assert x + 2 ≤ 2147483647;
-[eva] cond2.i:53: starting to merge loop iterations
+[eva:partition] cond2.i:53: starting to merge loop iterations
 [eva:alarm] cond2.i:53: Warning: signed overflow. assert y + 2 ≤ 2147483647;
-[eva] cond2.i:59: starting to merge loop iterations
+[eva:partition] cond2.i:59: starting to merge loop iterations
 [eva:alarm] cond2.i:59: Warning: signed overflow. assert x + 4 ≤ 2147483647;
-[eva] cond2.i:60: starting to merge loop iterations
+[eva:partition] cond2.i:60: starting to merge loop iterations
 [eva:alarm] cond2.i:60: Warning: signed overflow. assert y + 4 ≤ 2147483647;
-[eva] cond2.i:66: starting to merge loop iterations
+[eva:partition] cond2.i:66: starting to merge loop iterations
 [eva:alarm] cond2.i:66: Warning: out of bounds write. assert \valid(px);
-[eva] cond2.i:67: starting to merge loop iterations
+[eva:partition] cond2.i:67: starting to merge loop iterations
 [eva:alarm] cond2.i:67: Warning: out of bounds write. assert \valid(py);
 [eva] Recording results for un_1
 [eva] Done for function un_1
diff --git a/tests/value/oracle/control.res.oracle b/tests/value/oracle/control.res.oracle
index b68b69e450d5bd0b77768d59d86d03b91048e2e2..0397f939a372a1da83b367f0842259b1288ae17d 100644
--- a/tests/value/oracle/control.res.oracle
+++ b/tests/value/oracle/control.res.oracle
@@ -7,7 +7,7 @@
   y ∈ {0}
   c ∈ {0}
   d ∈ {0}
-[eva] control.i:11: starting to merge loop iterations
+[eva:partition] control.i:11: starting to merge loop iterations
 [eva:alarm] control.i:14: Warning: signed overflow. assert x + 1 ≤ 2147483647;
 [eva] Recording results for f
 [eva] Done for function f
diff --git a/tests/value/oracle/dataflow_order.res.oracle b/tests/value/oracle/dataflow_order.res.oracle
index fcd9f17f7328b17e3ff2265c75729dc317b443f9..a5c1cb383565f3387ce7dce9ad5c3cda9e4357d5 100644
--- a/tests/value/oracle/dataflow_order.res.oracle
+++ b/tests/value/oracle/dataflow_order.res.oracle
@@ -17,7 +17,7 @@
   Called from dataflow_order.i:25.
 [eva] Recording results for g
 [eva] Done for function g
-[eva] dataflow_order.i:17: starting to merge loop iterations
+[eva:partition] dataflow_order.i:17: starting to merge loop iterations
 [eva] dataflow_order.i:18: Frama_C_show_each_1: {0; 1}, {0; 1}
 [eva] dataflow_order.i:21: Frama_C_show_each_then: {1; 2}, {0; 1}
 [eva] computing for function f <- main.
diff --git a/tests/value/oracle/degeneration2.res.oracle b/tests/value/oracle/degeneration2.res.oracle
index eff8a7e0599a4ab260d119c5ea8ba5392688487c..065540b5f67dc41cc03586f9457478162d736dc3 100644
--- a/tests/value/oracle/degeneration2.res.oracle
+++ b/tests/value/oracle/degeneration2.res.oracle
@@ -18,7 +18,7 @@
   accessing uninitialized left-value. assert \initialized((int *)A);
 [eva:alarm] degeneration2.i:17: Warning: 
   out of bounds read. assert \valid_read((int *)A);
-[eva] degeneration2.i:16: starting to merge loop iterations
+[eva:partition] degeneration2.i:16: starting to merge loop iterations
 [eva:alarm] degeneration2.i:25: Warning: 
   accessing uninitialized left-value. assert \initialized(&offset_uninit);
 [eva] Recording results for main
diff --git a/tests/value/oracle/descending.res.oracle b/tests/value/oracle/descending.res.oracle
index 2f7ccf301edae78a93de2d2d01cfe7e0c471b3c9..f3c39b15c9c63a1ac9e17f7ac7be73a1b1318e7c 100644
--- a/tests/value/oracle/descending.res.oracle
+++ b/tests/value/oracle/descending.res.oracle
@@ -8,7 +8,7 @@
   Called from descending.i:33.
 [eva] computing for function f <- test1 <- main.
   Called from descending.i:12.
-[eva] descending.i:4: starting to merge loop iterations
+[eva:partition] descending.i:4: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
 [eva:alarm] descending.i:13: Warning: 
@@ -19,7 +19,7 @@
 [eva] Done for function test1
 [eva] computing for function test2 <- main.
   Called from descending.i:34.
-[eva] descending.i:22: starting to merge loop iterations
+[eva:partition] descending.i:22: starting to merge loop iterations
 [eva:alarm] descending.i:28: Warning: 
   accessing out of bounds index. assert j < 33;
 [eva] Recording results for test2
diff --git a/tests/value/oracle/div.res.oracle b/tests/value/oracle/div.res.oracle
index 4b8b6e318ca562e2e3c59d8b535d6efc78f52d03..f76cd1db5c6ba1352aedfb37aa70088e98083a91 100644
--- a/tests/value/oracle/div.res.oracle
+++ b/tests/value/oracle/div.res.oracle
@@ -29,7 +29,7 @@
   Called from div.i:86.
 [eva:alarm] div.i:14: Warning: signed overflow. assert c + 1 ≤ 2147483647;
 [eva:alarm] div.i:17: Warning: signed overflow. assert c + 2 ≤ 2147483647;
-[eva] div.i:14: starting to merge loop iterations
+[eva:partition] div.i:14: starting to merge loop iterations
 [eva:alarm] div.i:17: Warning: signed overflow. assert -2147483648 ≤ X - 1;
 [eva:alarm] div.i:16: Warning: signed overflow. assert X + 1 ≤ 2147483647;
 [eva:alarm] div.i:32: Warning: division by zero. assert Z2 ≢ 0;
diff --git a/tests/value/oracle/domains.res.oracle b/tests/value/oracle/domains.res.oracle
index 12c8078fc9069fedf60e77cb6543d17c5eb90da4..5bb482d01c270bc8a4f948c4ec50f9277129a034 100644
--- a/tests/value/oracle/domains.res.oracle
+++ b/tests/value/oracle/domains.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] domains.i:19: starting to merge loop iterations
+[eva:partition] domains.i:19: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/domains_function.0.res.oracle b/tests/value/oracle/domains_function.0.res.oracle
index b0dcbe8be76de6eb9ee9ddd6faa6c10b2fc22352..3ebb92bf40b8f42633cdf38b8644be69f6e7ee22 100644
--- a/tests/value/oracle/domains_function.0.res.oracle
+++ b/tests/value/oracle/domains_function.0.res.oracle
@@ -7,7 +7,7 @@
   i ∈ {0}
   result ∈ {0}
   t[0..9] ∈ {0}
-[eva] domains_function.c:118: starting to merge loop iterations
+[eva:partition] domains_function.c:118: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- main.
   Called from domains_function.c:120.
 [eva] using specification for function Frama_C_interval
diff --git a/tests/value/oracle/downcast.0.res.oracle b/tests/value/oracle/downcast.0.res.oracle
index 23099a0dc22d54f3064e85b07d7807957353f9e5..3adff23c540f8f3b4e85f09e5020c50c5390606f 100644
--- a/tests/value/oracle/downcast.0.res.oracle
+++ b/tests/value/oracle/downcast.0.res.oracle
@@ -87,7 +87,7 @@
 [eva] Done for function main9_bitfield
 [eva] computing for function main10_loop <- main.
   Called from downcast.c:187.
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/downcast.1.res.oracle b/tests/value/oracle/downcast.1.res.oracle
index a5144e5f1efac1c35b0e8f00594134e12a9131a7..ef0a6465f0008473256225d59c2a6f00324af63e 100644
--- a/tests/value/oracle/downcast.1.res.oracle
+++ b/tests/value/oracle/downcast.1.res.oracle
@@ -102,7 +102,7 @@
 [eva] computing for function main10_loop <- main.
   Called from downcast.c:187.
 [eva:alarm] downcast.c:173: Warning: signed downcast. assert bf.b ≤ 127;
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/downcast.2.res.oracle b/tests/value/oracle/downcast.2.res.oracle
index ba2c67d65b6024114aed38fe5768aa885e6ee21f..15c85130ec84d9d659e08540dab343e21d5230c3 100644
--- a/tests/value/oracle/downcast.2.res.oracle
+++ b/tests/value/oracle/downcast.2.res.oracle
@@ -96,7 +96,7 @@
   Called from downcast.c:187.
 [eva:alarm] downcast.c:172: Warning: unsigned downcast. assert 0 ≤ v;
 [eva:alarm] downcast.c:172: Warning: unsigned downcast. assert v ≤ 1023;
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/downcast.3.res.oracle b/tests/value/oracle/downcast.3.res.oracle
index 1a72c7891a656924a8413c05042cb26937853cf8..30a3b438f9b45c0bab93325772cb0d02c79c6ff7 100644
--- a/tests/value/oracle/downcast.3.res.oracle
+++ b/tests/value/oracle/downcast.3.res.oracle
@@ -98,7 +98,7 @@
   Called from downcast.c:187.
 [eva:alarm] downcast.c:173: Warning: signed downcast. assert -128 ≤ (int)bf.b;
 [eva:alarm] downcast.c:173: Warning: signed downcast. assert (int)bf.b ≤ 127;
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/downcast.4.res.oracle b/tests/value/oracle/downcast.4.res.oracle
index 7d3e9e83658c6937a9ce4933d678a26a703e5b42..67f02815d8779cbd3a88dbb82feaa5614e92740e 100644
--- a/tests/value/oracle/downcast.4.res.oracle
+++ b/tests/value/oracle/downcast.4.res.oracle
@@ -76,7 +76,7 @@
 [eva] Done for function main9_bitfield
 [eva] computing for function main10_loop <- main.
   Called from downcast.c:187.
-[eva] downcast.c:171: starting to merge loop iterations
+[eva:partition] downcast.c:171: starting to merge loop iterations
 [eva] Recording results for main10_loop
 [eva] Done for function main10_loop
 [eva] Recording results for main
diff --git a/tests/value/oracle/dur.res.oracle b/tests/value/oracle/dur.res.oracle
index 5e56c435fdf4ad3007bb1aeab20ea08a34fb8a07..629a0d1f9a8cf69fea7cc7186c20924cfcc90154 100644
--- a/tests/value/oracle/dur.res.oracle
+++ b/tests/value/oracle/dur.res.oracle
@@ -155,7 +155,7 @@
     {.M92[5]{.M2; .M3}; .M93[0..4]} ∈ [--..--]
   G6 ∈ [--..--]
   G7[0..160] ∈ [--..--]
-[eva] dur.i:167: starting to merge loop iterations
+[eva:partition] dur.i:167: starting to merge loop iterations
 [eva] Recording results for F2
 [eva] Done for function F2
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/empty_struct.5.res.oracle b/tests/value/oracle/empty_struct.5.res.oracle
index 5fc51fa1c2f9c0675ff473b917744a3e2a9426d6..70ae8e15a839d4ba534e1e004b561a07dd91480e 100644
--- a/tests/value/oracle/empty_struct.5.res.oracle
+++ b/tests/value/oracle/empty_struct.5.res.oracle
@@ -8,12 +8,12 @@
   nondet ∈ [--..--]
   pgs ∈ {{ &gs }}
 [eva] empty_struct.c:78: Call to builtin malloc
-[eva] empty_struct.c:78: allocating variable __malloc_main3_l78
+[eva:malloc:new] empty_struct.c:78: allocating variable __malloc_main3_l78
 [eva] empty_struct.c:79: Call to builtin realloc
 [eva] empty_struct.c:79: 
   function realloc: precondition 'freeable' got status valid.
-[eva] empty_struct.c:79: allocating variable __realloc_main3_l79
-[eva] empty_struct.c:81: starting to merge loop iterations
+[eva:malloc:new] empty_struct.c:79: allocating variable __realloc_main3_l79
+[eva:partition] empty_struct.c:81: starting to merge loop iterations
 [eva] empty_struct.c:86: Call to builtin free
 [eva] empty_struct.c:86: 
   function free: precondition 'freeable' got status valid.
diff --git a/tests/value/oracle/enum.res.oracle b/tests/value/oracle/enum.res.oracle
index 880bfa879bab6a26bdd0f5b52cfe282372329478..be3fff0502052e27a1e7048d28edc95c41264dbb 100644
--- a/tests/value/oracle/enum.res.oracle
+++ b/tests/value/oracle/enum.res.oracle
@@ -7,7 +7,7 @@
    [1..2] ∈ {0}
   u[0] ∈ {2}
    [1..2] ∈ {0}
-[eva] enum.i:16: starting to merge loop iterations
+[eva:partition] enum.i:16: starting to merge loop iterations
 [eva] enum.i:20: assertion got status valid.
 [eva] Recording results for f
 [eva] Done for function f
diff --git a/tests/value/oracle/exit_paths.res.oracle b/tests/value/oracle/exit_paths.res.oracle
index 11df2b9e88acd66bf27ef3b3bb9446f295e2d522..1deaa00e4a244c7cabd50152adc5e785a1f61371 100644
--- a/tests/value/oracle/exit_paths.res.oracle
+++ b/tests/value/oracle/exit_paths.res.oracle
@@ -8,7 +8,7 @@
   Called from exit_paths.i:71.
 [eva] exit_paths.i:11: Frama_C_show_each_1: {{ "On exit path" }}, {0}
 [eva] exit_paths.i:16: Frama_C_show_each_3: {{ "Not on exit path" }}, {0}
-[eva] exit_paths.i:10: starting to merge loop iterations
+[eva:partition] exit_paths.i:10: starting to merge loop iterations
 [eva] exit_paths.i:11: Frama_C_show_each_1: {{ "On exit path" }}, {0; 1}
 [eva] exit_paths.i:16: Frama_C_show_each_3: {{ "Not on exit path" }}, {0; 1}
 [eva] exit_paths.i:11: Frama_C_show_each_1: {{ "On exit path" }}, {0; 1; 2}
@@ -25,7 +25,7 @@
 [eva] exit_paths.i:25: Frama_C_show_each_4: {{ "On exit path" }}, {0}
 [eva] exit_paths.i:28: Frama_C_show_each_5: {{ "On exit path" }}, {0}, {0}
 [eva] exit_paths.i:37: Frama_C_show_each_8: {{ "Not on exit path" }}, {0}, {0}
-[eva] exit_paths.i:27: starting to merge loop iterations
+[eva:partition] exit_paths.i:27: starting to merge loop iterations
 [eva] exit_paths.i:28: Frama_C_show_each_5: {{ "On exit path" }}, {0}, {0; 1}
 [eva] exit_paths.i:37: 
   Frama_C_show_each_8: {{ "Not on exit path" }}, {0}, {0; 1}
@@ -39,7 +39,7 @@
 [eva] exit_paths.i:30: 
   Frama_C_show_each_6: {{ "Not on exit path" }}, {0}, [10..2147483647]
 [eva] exit_paths.i:40: Frama_C_show_each_9: {{ "Not on exit path" }}, {0}
-[eva] exit_paths.i:24: starting to merge loop iterations
+[eva:partition] exit_paths.i:24: starting to merge loop iterations
 [eva] exit_paths.i:25: Frama_C_show_each_4: {{ "On exit path" }}, {0; 1}
 [eva] exit_paths.i:28: 
   Frama_C_show_each_5: {{ "On exit path" }}, {0; 1}, [0..2147483647]
@@ -80,7 +80,7 @@
 [eva] exit_paths.i:49: Frama_C_show_each_10: {{ "On exit path" }}, {0}
 [eva] exit_paths.i:52: Frama_C_show_each_11: {{ "On exit path" }}, {0}, {0}
 [eva] exit_paths.i:57: Frama_C_show_each_13: {{ "On exit path" }}, {0}, {0}
-[eva] exit_paths.i:51: starting to merge loop iterations
+[eva:partition] exit_paths.i:51: starting to merge loop iterations
 [eva] exit_paths.i:52: Frama_C_show_each_11: {{ "On exit path" }}, {0}, {0; 1}
 [eva] exit_paths.i:57: Frama_C_show_each_13: {{ "On exit path" }}, {0}, {0; 1}
 [eva] exit_paths.i:52: 
@@ -93,7 +93,7 @@
 [eva] exit_paths.i:54: 
   Frama_C_show_each_12: {{ "On exit path" }}, {0}, [10..2147483647]
 [eva] exit_paths.i:64: Frama_C_show_each_15: {{ "Not on exit path" }}, {0}
-[eva] exit_paths.i:48: starting to merge loop iterations
+[eva:partition] exit_paths.i:48: starting to merge loop iterations
 [eva] exit_paths.i:49: Frama_C_show_each_10: {{ "On exit path" }}, {0; 1}
 [eva] exit_paths.i:52: 
   Frama_C_show_each_11: {{ "On exit path" }}, {0; 1}, [0..2147483647]
diff --git a/tests/value/oracle/find_ivaltop.res.oracle b/tests/value/oracle/find_ivaltop.res.oracle
index e14c0b6156a562fe1d758e3a2c8fa5332abf07d1..617d28d6670eccbedf820bdee8cc6910a09b2485 100644
--- a/tests/value/oracle/find_ivaltop.res.oracle
+++ b/tests/value/oracle/find_ivaltop.res.oracle
@@ -23,7 +23,7 @@
    [17] ∈ {8}
    [18] ∈ {9}
    [19] ∈ {0}
-[eva] find_ivaltop.i:6: starting to merge loop iterations
+[eva:partition] find_ivaltop.i:6: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/for_loops.0.res.oracle b/tests/value/oracle/for_loops.0.res.oracle
index 62c79becea699e814dfba2da8248854209039557..a1b79c2e23a863489c2c59a674bf2ad66c443964 100644
--- a/tests/value/oracle/for_loops.0.res.oracle
+++ b/tests/value/oracle/for_loops.0.res.oracle
@@ -11,8 +11,8 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] for_loops.c:30: Frama_C_show_each_F: {0}
-[eva] for_loops.c:27: starting to merge loop iterations
-[eva] for_loops.c:29: starting to merge loop iterations
+[eva:partition] for_loops.c:27: starting to merge loop iterations
+[eva:partition] for_loops.c:29: starting to merge loop iterations
 [eva] for_loops.c:30: Frama_C_show_each_F: {0; 1}
 [eva] for_loops.c:30: Frama_C_show_each_F: {0; 1; 2}
 [eva] for_loops.c:30: Frama_C_show_each_F: [0..2147483647]
diff --git a/tests/value/oracle/for_loops.1.res.oracle b/tests/value/oracle/for_loops.1.res.oracle
index ea0a97f74b16fb60dfdf72505b98844a0e572e2b..2364e21e490aa286ffbe59630a78d971a65fdff9 100644
--- a/tests/value/oracle/for_loops.1.res.oracle
+++ b/tests/value/oracle/for_loops.1.res.oracle
@@ -16,7 +16,7 @@
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
 [eva] for_loops.c:17: Frama_C_show_each_F: {0; 1}
-[eva] for_loops.c:16: starting to merge loop iterations
+[eva:partition] for_loops.c:16: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- main_2.
   Called from for_loops.c:16.
 [eva] Done for function Frama_C_interval
diff --git a/tests/value/oracle/for_loops.2.res.oracle b/tests/value/oracle/for_loops.2.res.oracle
index dee160a2e94509502fd7b9dd35fd3458a2153489..fe463f694c55b6ed6839f60124d6205adb505e2b 100644
--- a/tests/value/oracle/for_loops.2.res.oracle
+++ b/tests/value/oracle/for_loops.2.res.oracle
@@ -21,7 +21,7 @@
   nSelectors ∈ [0..1000]
   w ∈ {0}
   ==END OF DUMP==
-[eva] for_loops.c:40: starting to merge loop iterations
+[eva:partition] for_loops.c:40: starting to merge loop iterations
 [eva] for_loops.c:41: 
   Frama_C_dump_each:
   # cvalue:
@@ -35,7 +35,7 @@
   ==END OF DUMP==
 [eva:alarm] for_loops.c:42: Warning: 
   accessing uninitialized left-value. assert \initialized(&T[j]);
-[eva] for_loops.c:42: starting to merge loop iterations
+[eva:partition] for_loops.c:42: starting to merge loop iterations
 [eva:alarm] for_loops.c:42: Warning: 
   signed overflow. assert w + T[j] ≤ 2147483647;
 [eva] for_loops.c:43: Frama_C_show_each: [0..2147483647]
diff --git a/tests/value/oracle/for_loops.3.res.oracle b/tests/value/oracle/for_loops.3.res.oracle
index 0909a535a536f2bdb2a52ce901ac34e64bd87f86..d8e1d99a7d72fc94e2101f20f8f43aa9353d7a7b 100644
--- a/tests/value/oracle/for_loops.3.res.oracle
+++ b/tests/value/oracle/for_loops.3.res.oracle
@@ -5,8 +5,8 @@
 [eva:initial-state] Values of globals at initialization
   x ∈ {0}
 [eva] for_loops.c:55: Frama_C_show_each_F: {0}, {0}
-[eva] for_loops.c:50: starting to merge loop iterations
-[eva] for_loops.c:52: starting to merge loop iterations
+[eva:partition] for_loops.c:50: starting to merge loop iterations
+[eva:partition] for_loops.c:52: starting to merge loop iterations
 [eva] for_loops.c:55: Frama_C_show_each_F: {0; 1}, [0..2147483647]
 [eva] for_loops.c:55: Frama_C_show_each_F: {0; 1; 2}, [0..2147483647]
 [eva] for_loops.c:55: Frama_C_show_each_F: {0; 1; 2; 3; 4; 5}, [0..2147483647]
diff --git a/tests/value/oracle/fptr.0.res.oracle b/tests/value/oracle/fptr.0.res.oracle
index e45c89118891dc389102b876a201962ebfa4ca70..da2a48f2d8ed5db04737833e273a69deb1fce1d8 100644
--- a/tests/value/oracle/fptr.0.res.oracle
+++ b/tests/value/oracle/fptr.0.res.oracle
@@ -46,7 +46,7 @@
 [eva] Recording results for f
 [eva] Done for function f
 [eva] fptr.i:52: Frama_C_show_each: {0}
-[eva] fptr.i:50: starting to merge loop iterations
+[eva:partition] fptr.i:50: starting to merge loop iterations
 [eva] fptr.i:51: Frama_C_show_each_F: {{ &h ; &hh }}
 [eva] computing for function f <- main.
   Called from fptr.i:52.
diff --git a/tests/value/oracle/fptr.1.res.oracle b/tests/value/oracle/fptr.1.res.oracle
index fcaefec6fb2b8b514cf3eb186eba79f64302b0c3..7ddaa7b99e867cc24526468d74558750ac9b05aa 100644
--- a/tests/value/oracle/fptr.1.res.oracle
+++ b/tests/value/oracle/fptr.1.res.oracle
@@ -31,7 +31,7 @@
 [eva] Done for function h
 [eva] Recording results for f
 [eva] Done for function f
-[eva] fptr.i:66: starting to merge loop iterations
+[eva:partition] fptr.i:66: starting to merge loop iterations
 [eva] fptr.i:67: Frama_C_show_each_F: {{ &h ; &hh }}
 [eva] computing for function f <- main_uninit.
   Called from fptr.i:68.
diff --git a/tests/value/oracle/gauges.res.oracle b/tests/value/oracle/gauges.res.oracle
index 77cb1d73a4c0194c288f83d91772e9dc4b0d9a06..413ec90c54ad364dec3351c94181e610edf95988 100644
--- a/tests/value/oracle/gauges.res.oracle
+++ b/tests/value/oracle/gauges.res.oracle
@@ -11,7 +11,7 @@
   Called from gauges.c:350.
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:21: Frama_C_show_each_1: {{ "in" }}
-[eva] gauges.c:18: starting to merge loop iterations
+[eva:partition] gauges.c:18: starting to merge loop iterations
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:21: Frama_C_show_each_1: {{ "in" }}
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
@@ -23,7 +23,7 @@
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:21: Frama_C_show_each_1: {{ "in" }}
 [eva:alarm] gauges.c:23: Warning: signed overflow. assert -2147483648 ≤ j - 4;
-[eva] gauges.c:16: starting to merge loop iterations
+[eva:partition] gauges.c:16: starting to merge loop iterations
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:21: Frama_C_show_each_1: {{ "in" }}
 [eva] gauges.c:19: Frama_C_show_each_0: {{ "in" }}
@@ -41,7 +41,7 @@
   Called from gauges.c:351.
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:43: Frama_C_show_each_1: {{ "in" }}
-[eva] gauges.c:40: starting to merge loop iterations
+[eva:partition] gauges.c:40: starting to merge loop iterations
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:43: Frama_C_show_each_1: {{ "in" }}
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
@@ -53,7 +53,7 @@
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:43: Frama_C_show_each_1: {{ "in" }}
 [eva:alarm] gauges.c:45: Warning: signed overflow. assert -2147483648 ≤ j - 4;
-[eva] gauges.c:38: starting to merge loop iterations
+[eva:partition] gauges.c:38: starting to merge loop iterations
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
 [eva] gauges.c:43: Frama_C_show_each_1: {{ "in" }}
 [eva] gauges.c:41: Frama_C_show_each_0: {{ "in" }}
@@ -70,7 +70,7 @@
 [eva] computing for function main1 <- main.
   Called from gauges.c:352.
 [eva] gauges.c:59: Frama_C_show_each: {{ "in" }}
-[eva] gauges.c:57: starting to merge loop iterations
+[eva:partition] gauges.c:57: starting to merge loop iterations
 [eva] gauges.c:59: Frama_C_show_each: {{ "in" }}
 [eva] gauges.c:59: Frama_C_show_each: {{ "in" }}
 [eva] gauges.c:59: Frama_C_show_each: {{ "in" }}
@@ -83,7 +83,7 @@
 [eva] computing for function main2 <- main.
   Called from gauges.c:353.
 [eva] gauges.c:72: Frama_C_show_each:
-[eva] gauges.c:70: starting to merge loop iterations
+[eva:partition] gauges.c:70: starting to merge loop iterations
 [eva] gauges.c:72: Frama_C_show_each:
 [eva] gauges.c:72: Frama_C_show_each:
 [eva] gauges.c:72: Frama_C_show_each:
@@ -99,7 +99,7 @@
 [eva] computing for function main3 <- main.
   Called from gauges.c:354.
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
-[eva] gauges.c:79: starting to merge loop iterations
+[eva:partition] gauges.c:79: starting to merge loop iterations
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
@@ -108,7 +108,7 @@
 [eva:alarm] gauges.c:81: Warning: signed overflow. assert k + 1 ≤ 2147483647;
 [eva] gauges.c:83: Frama_C_show_each: {{ "outer" }}
 [eva:alarm] gauges.c:84: Warning: signed overflow. assert k + 1 ≤ 2147483647;
-[eva] gauges.c:78: starting to merge loop iterations
+[eva:partition] gauges.c:78: starting to merge loop iterations
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
 [eva] gauges.c:83: Frama_C_show_each: {{ "outer" }}
 [eva] gauges.c:80: Frama_C_show_each: {{ "inner" }}
@@ -123,7 +123,7 @@
 [eva] computing for function main4_search <- main4 <- main.
   Called from gauges.c:107.
 [eva] gauges.c:97: Frama_C_show_each:
-[eva] gauges.c:96: starting to merge loop iterations
+[eva:partition] gauges.c:96: starting to merge loop iterations
 [eva] gauges.c:97: Frama_C_show_each:
 [eva] gauges.c:97: Frama_C_show_each:
 [eva] gauges.c:97: Frama_C_show_each:
@@ -137,7 +137,7 @@
 [eva] computing for function main5 <- main.
   Called from gauges.c:356.
 [eva] gauges.c:116: Frama_C_show_each: {{ &x }}
-[eva] gauges.c:113: starting to merge loop iterations
+[eva:partition] gauges.c:113: starting to merge loop iterations
 [eva] gauges.c:116: Frama_C_show_each: {{ &x + {0; 4} }}
 [eva] gauges.c:116: Frama_C_show_each: {{ &x + {0; 4; 8} }}
 [eva] gauges.c:116: Frama_C_show_each: {{ &x + {0; 4; 8; 12} ; &y }}
@@ -159,7 +159,7 @@
 [eva] gauges.c:129: Frama_C_show_each: {{ &x + {8} }}
 [eva] gauges.c:129: Frama_C_show_each: {{ &y }}
 [eva] gauges.c:129: Frama_C_show_each: {{ &y + {4} }}
-[eva] gauges.c:126: starting to merge loop iterations
+[eva:partition] gauges.c:126: starting to merge loop iterations
 [eva] gauges.c:129: Frama_C_show_each: {{ &y + {4; 8} }}
 [eva] gauges.c:129: Frama_C_show_each: {{ &y + {4; 8; 12} }}
 [eva] gauges.c:129: Frama_C_show_each: {{ &y + {4; 8; 12; 16} }}
@@ -171,7 +171,7 @@
 [eva] Done for function main5_bis
 [eva] computing for function main6 <- main.
   Called from gauges.c:358.
-[eva] gauges.c:138: starting to merge loop iterations
+[eva:partition] gauges.c:138: starting to merge loop iterations
 [eva:alarm] gauges.c:140: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] Recording results for main6
 [eva] Done for function main6
@@ -180,7 +180,7 @@
 [eva] computing for function main7_aux <- main7 <- main.
   Called from gauges.c:164.
 [eva] gauges.c:145: Frama_C_show_each:
-[eva] gauges.c:147: starting to merge loop iterations
+[eva:partition] gauges.c:147: starting to merge loop iterations
 [eva:alarm] gauges.c:149: Warning: 
   out of bounds write. assert \valid(tmp);
                        (tmp from p--)
@@ -189,7 +189,7 @@
 [eva] computing for function main7_aux2 <- main7 <- main.
   Called from gauges.c:165.
 [eva] gauges.c:154: Frama_C_show_each:
-[eva] gauges.c:156: starting to merge loop iterations
+[eva:partition] gauges.c:156: starting to merge loop iterations
 [eva:alarm] gauges.c:158: Warning: 
   out of bounds write. assert \valid(tmp);
                        (tmp from p--)
@@ -206,7 +206,7 @@
 [eva] gauges.c:172: Frama_C_show_each: {0}
 [eva] gauges.c:172: Frama_C_show_each: {4294967295}
 [eva] gauges.c:172: Frama_C_show_each: {4294967294}
-[eva] gauges.c:171: starting to merge loop iterations
+[eva:partition] gauges.c:171: starting to merge loop iterations
 [eva] gauges.c:172: Frama_C_show_each: {4294967293; 4294967294}
 [eva] gauges.c:172: Frama_C_show_each: {4294967292; 4294967293; 4294967294}
 [eva] gauges.c:172: Frama_C_show_each: [2147483647..4294967294]
@@ -225,7 +225,7 @@
 [eva] Done for function main8
 [eva] computing for function main9 <- main.
   Called from gauges.c:361.
-[eva] gauges.c:186: starting to merge loop iterations
+[eva:partition] gauges.c:186: starting to merge loop iterations
 [eva:alarm] gauges.c:188: Warning: 
   pointer downcast. assert (unsigned int)p ≤ 2147483647;
 [eva:alarm] gauges.c:188: Warning: 
@@ -245,7 +245,7 @@
   Called from gauges.c:362.
 [eva] computing for function main10_aux <- main10 <- main.
   Called from gauges.c:211.
-[eva] gauges.c:201: starting to merge loop iterations
+[eva:partition] gauges.c:201: starting to merge loop iterations
 [eva:alarm] gauges.c:202: Warning: 
   out of bounds read. assert \valid_read(tmp);
                       (tmp from A++)
@@ -269,7 +269,7 @@
 [eva] computing for function main11 <- main.
   Called from gauges.c:363.
 [eva] gauges.c:218: Frama_C_show_each:
-[eva] gauges.c:217: starting to merge loop iterations
+[eva:partition] gauges.c:217: starting to merge loop iterations
 [eva] gauges.c:218: Frama_C_show_each:
 [eva] gauges.c:218: Frama_C_show_each:
 [eva] gauges.c:218: Frama_C_show_each:
@@ -284,7 +284,7 @@
 [eva] Done for function main11
 [eva] computing for function main12 <- main.
   Called from gauges.c:364.
-[eva] gauges.c:225: starting to merge loop iterations
+[eva:partition] gauges.c:225: starting to merge loop iterations
 [eva:alarm] gauges.c:225: Warning: signed overflow. assert i + 1 ≤ 2147483647;
 [eva] Recording results for main12
 [eva] Done for function main12
@@ -292,7 +292,7 @@
   Called from gauges.c:365.
 [eva] computing for function main13_1 <- main13 <- main.
   Called from gauges.c:280.
-[eva] gauges.c:238: starting to merge loop iterations
+[eva:partition] gauges.c:238: starting to merge loop iterations
 [eva:alarm] gauges.c:240: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:242: 
   Frama_C_show_each: {45; 46; 47; 48; 49; 50; 51}, [0..2147483647]
@@ -300,7 +300,7 @@
 [eva] Done for function main13_1
 [eva] computing for function main13_2 <- main13 <- main.
   Called from gauges.c:281.
-[eva] gauges.c:249: starting to merge loop iterations
+[eva:partition] gauges.c:249: starting to merge loop iterations
 [eva:alarm] gauges.c:251: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:254: 
   Frama_C_show_each: {48; 49; 50; 51; 52; 53; 54}, [0..2147483647]
@@ -308,7 +308,7 @@
 [eva] Done for function main13_2
 [eva] computing for function main13_3 <- main13 <- main.
   Called from gauges.c:282.
-[eva] gauges.c:261: starting to merge loop iterations
+[eva:partition] gauges.c:261: starting to merge loop iterations
 [eva:alarm] gauges.c:263: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:265: 
   Frama_C_show_each: {-59; -58; -57; -56; -55; -54; -53}, [0..2147483647]
@@ -316,7 +316,7 @@
 [eva] Done for function main13_3
 [eva] computing for function main13_4 <- main13 <- main.
   Called from gauges.c:283.
-[eva] gauges.c:272: starting to merge loop iterations
+[eva:partition] gauges.c:272: starting to merge loop iterations
 [eva:alarm] gauges.c:274: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:276: 
   Frama_C_show_each: {-64; -63; -62; -61; -60; -59; -58}, [0..2147483647]
@@ -326,7 +326,7 @@
 [eva] Done for function main13
 [eva] computing for function main14 <- main.
   Called from gauges.c:366.
-[eva] gauges.c:291: starting to merge loop iterations
+[eva:partition] gauges.c:291: starting to merge loop iterations
 [eva:alarm] gauges.c:293: Warning: signed overflow. assert j + 1 ≤ 2147483647;
 [eva] gauges.c:297: 
   Frama_C_show_each: {-593; -592; -591; -590; -589; -588}, [0..2147483647]
@@ -395,7 +395,7 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] gauges.c:304: starting to merge loop iterations
+[eva:partition] gauges.c:304: starting to merge loop iterations
 [eva] gauges.c:306: 
   Frama_C_dump_each:
   # cvalue:
@@ -583,8 +583,8 @@
 [eva] Done for function main15
 [eva] computing for function main16 <- main.
   Called from gauges.c:368.
-[eva] gauges.c:323: starting to merge loop iterations
-[eva] gauges.c:324: starting to merge loop iterations
+[eva:partition] gauges.c:323: starting to merge loop iterations
+[eva:partition] gauges.c:324: starting to merge loop iterations
 [eva] gauges.c:325: 
   Frama_C_dump_each:
   # cvalue:
@@ -646,8 +646,8 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] gauges.c:326: starting to merge loop iterations
-[eva] gauges.c:321: starting to merge loop iterations
+[eva:partition] gauges.c:326: starting to merge loop iterations
+[eva:partition] gauges.c:321: starting to merge loop iterations
 [eva] gauges.c:325: 
   Frama_C_dump_each:
   # cvalue:
@@ -709,14 +709,14 @@
   S_0___fc_env[0..1] ∈ [--..--]
   S_1___fc_env[0..1] ∈ [--..--]
   ==END OF DUMP==
-[eva] gauges.c:327: starting to merge loop iterations
+[eva:partition] gauges.c:327: starting to merge loop iterations
 [eva] Recording results for main16
 [eva] Done for function main16
 [eva] computing for function main17 <- main.
   Called from gauges.c:369.
 [eva] gauges.c:343: Call to builtin malloc
-[eva] gauges.c:343: allocating variable __malloc_main17_l343
-[eva] gauges.c:342: starting to merge loop iterations
+[eva:malloc:new] gauges.c:343: allocating variable __malloc_main17_l343
+[eva:partition] gauges.c:342: starting to merge loop iterations
 [eva] gauges.c:343: Call to builtin malloc
 [eva] Recording results for main17
 [eva] Done for function main17
diff --git a/tests/value/oracle/ghost.res.oracle b/tests/value/oracle/ghost.res.oracle
index a4786e45575ea37cfdd5271703fc959c47870c47..188e80759a55e6a92682ea27223bea6f24c70a52 100644
--- a/tests/value/oracle/ghost.res.oracle
+++ b/tests/value/oracle/ghost.res.oracle
@@ -6,7 +6,7 @@
   G ∈ {0}
   GHOST ∈ {0}
   H ∈ {0}
-[eva] ghost.i:16: starting to merge loop iterations
+[eva:partition] ghost.i:16: starting to merge loop iterations
 [eva:alarm] ghost.i:17: Warning: signed overflow. assert G + 1 ≤ 2147483647;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/value/oracle/hierarchical_convergence.res.oracle b/tests/value/oracle/hierarchical_convergence.res.oracle
index 624c9b0b38ad898a315920c0e4ee32e8b153184b..e839e52b7516386e66b65241b91edf87cea8ab5e 100644
--- a/tests/value/oracle/hierarchical_convergence.res.oracle
+++ b/tests/value/oracle/hierarchical_convergence.res.oracle
@@ -7,10 +7,10 @@
 [eva] computing for function f <- main.
   Called from hierarchical_convergence.c:19.
 [eva] hierarchical_convergence.c:8: Frama_C_show_each: {0}
-[eva] hierarchical_convergence.c:7: starting to merge loop iterations
+[eva:partition] hierarchical_convergence.c:7: starting to merge loop iterations
 [eva] hierarchical_convergence.c:8: Frama_C_show_each: {0; 1}
 [eva] hierarchical_convergence.c:10: Frama_C_show_each: {1}, {0}
-[eva] hierarchical_convergence.c:9: starting to merge loop iterations
+[eva:partition] hierarchical_convergence.c:9: starting to merge loop iterations
 [eva] hierarchical_convergence.c:8: Frama_C_show_each: {0; 1; 2}
 [eva] hierarchical_convergence.c:10: Frama_C_show_each: {1; 2}, {0}
 [eva] hierarchical_convergence.c:10: Frama_C_show_each: {1; 2}, {0; 1}
diff --git a/tests/value/oracle/ilevel.0.res.oracle b/tests/value/oracle/ilevel.0.res.oracle
index d6704892c67808c3a073a3a700e9faa748ce6999..59bf19b027647fbe03d692093a07b746d7f946cc 100644
--- a/tests/value/oracle/ilevel.0.res.oracle
+++ b/tests/value/oracle/ilevel.0.res.oracle
@@ -8,8 +8,8 @@
   j ∈ {0}
   k ∈ {0}
   l ∈ {0}
-[eva] ilevel.c:15: starting to merge loop iterations
-[eva] ilevel.c:18: starting to merge loop iterations
+[eva:partition] ilevel.c:15: starting to merge loop iterations
+[eva:partition] ilevel.c:18: starting to merge loop iterations
 [eva:alarm] ilevel.c:26: Warning: assertion got status unknown.
 [eva:alarm] ilevel.c:28: Warning: assertion got status unknown.
 [eva] ilevel.c:30: Frama_C_show_each: [0..9]
@@ -48,8 +48,8 @@
   j ∈ {0}
   k ∈ {0}
   l ∈ {0}
-[eva] ilevel.c:15: starting to merge loop iterations
-[eva] ilevel.c:18: starting to merge loop iterations
+[eva:partition] ilevel.c:15: starting to merge loop iterations
+[eva:partition] ilevel.c:18: starting to merge loop iterations
 [eva:alarm] ilevel.c:32: Warning: 
   signed overflow. assert (int)((int)(i + j) + k) + l ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/value/oracle/initialized.res.oracle b/tests/value/oracle/initialized.res.oracle
index 36b383499c8174f9e2171064ccf362c7f46e6982..ea945a5ebf10f65a1f28a7f93e66d0484621dd65 100644
--- a/tests/value/oracle/initialized.res.oracle
+++ b/tests/value/oracle/initialized.res.oracle
@@ -14,7 +14,7 @@
   i6 ∈ [--..--]
 [eva] computing for function g1 <- main.
   Called from initialized.c:193.
-[eva] initialized.c:19: starting to merge loop iterations
+[eva:partition] initialized.c:19: starting to merge loop iterations
 [eva:alarm] initialized.c:21: Warning: assertion got status unknown.
 [eva:alarm] initialized.c:22: Warning: assertion got status unknown.
 [eva] computing for function Frama_C_interval <- g1 <- main.
@@ -159,7 +159,7 @@
   accessing uninitialized left-value. assert \initialized(&x3);
 [eva] computing for function f <- g3 <- main.
   Called from initialized.c:98.
-[eva] initialized.c:11: starting to merge loop iterations
+[eva:partition] initialized.c:11: starting to merge loop iterations
 [eva:alarm] initialized.c:8: Warning: 
   function f: postcondition got status invalid.
 [eva:alarm] initialized.c:8: Warning: 
@@ -226,7 +226,7 @@
 [eva:alarm] initialized.c:178: Warning: check 'unknown' got status unknown.
 [eva:alarm] initialized.c:182: Warning: assertion got status unknown.
 [eva:alarm] initialized.c:183: Warning: check 'invalid' got status unknown.
-[eva] initialized.c:186: starting to merge loop iterations
+[eva:partition] initialized.c:186: starting to merge loop iterations
 [eva:alarm] initialized.c:188: Warning: assertion got status unknown.
 [eva:alarm] initialized.c:189: Warning: check 'unknown' got status unknown.
 [eva] Recording results for reduce_by_negation
diff --git a/tests/value/oracle/inout.1.res.oracle b/tests/value/oracle/inout.1.res.oracle
index 9c5de406f424973c655904a8a1397bf03a68ce71..b0b8c0a4008283600f16d2b3de479da5a8685b27 100644
--- a/tests/value/oracle/inout.1.res.oracle
+++ b/tests/value/oracle/inout.1.res.oracle
@@ -20,7 +20,7 @@
       [6] ∈ {25}
       [7] ∈ {40}
   I5_nt ∈ {0}
-[eva] inout.i:37: starting to merge loop iterations
+[eva:partition] inout.i:37: starting to merge loop iterations
 [eva:alarm] inout.i:42: Warning: 
   accessing uninitialized left-value. assert \initialized(&r);
 [eva] Recording results for inout_11_3
diff --git a/tests/value/oracle/interpol.res.oracle b/tests/value/oracle/interpol.res.oracle
index 9c7a7e8e4608e54861b99948c9008e1273c7d2b7..708dc39a8fad41e0d33efc04c76ea63f489bad1f 100644
--- a/tests/value/oracle/interpol.res.oracle
+++ b/tests/value/oracle/interpol.res.oracle
@@ -12,7 +12,7 @@
    [6] ∈ {64}
    [7] ∈ {128}
 [eva] interpol.c:16: Frama_C_show_each_ok: {0}, {-1}
-[eva] interpol.c:10: starting to merge loop iterations
+[eva:partition] interpol.c:10: starting to merge loop iterations
 [eva] interpol.c:16: Frama_C_show_each_ok: {0; 1}, {-2; -1}
 [eva] interpol.c:16: Frama_C_show_each_ok: {0; 1; 2}, {-4; -2; -1}
 [eva] interpol.c:16: 
diff --git a/tests/value/oracle/invalid_pointer.0.res.oracle b/tests/value/oracle/invalid_pointer.0.res.oracle
index affe7ba32442d6450896b49b142ab6032809369b..55aebb84ce4ea4722c6f236e578a1167aadec998 100644
--- a/tests/value/oracle/invalid_pointer.0.res.oracle
+++ b/tests/value/oracle/invalid_pointer.0.res.oracle
@@ -38,7 +38,8 @@
 [eva] Done for function pointer_computation
 [eva] computing for function pointer_in_loops <- main.
   Called from invalid_pointer.c:191.
-[eva] invalid_pointer.c:43: Trace partitioning superposing up to 100 states
+[eva:partition] invalid_pointer.c:43: 
+  Trace partitioning superposing up to 100 states
 [eva:alarm] invalid_pointer.c:52: Warning: 
   invalid pointer creation. assert \object_pointer(q - 1);
 [eva] Recording results for pointer_in_loops
diff --git a/tests/value/oracle/invalid_pointer.1.res.oracle b/tests/value/oracle/invalid_pointer.1.res.oracle
index 31b3c97117258650fd7dae38d1809487992ddcde..cf4c5c8409102fe871c847357c1c5f4c32f5b3df 100644
--- a/tests/value/oracle/invalid_pointer.1.res.oracle
+++ b/tests/value/oracle/invalid_pointer.1.res.oracle
@@ -24,7 +24,8 @@
 [eva] Done for function pointer_computation
 [eva] computing for function pointer_in_loops <- main.
   Called from invalid_pointer.c:191.
-[eva] invalid_pointer.c:43: Trace partitioning superposing up to 100 states
+[eva:partition] invalid_pointer.c:43: 
+  Trace partitioning superposing up to 100 states
 [eva] invalid_pointer.c:54: Frama_C_show_each_bottom: {{ &t + {-4} }}
 [eva] Recording results for pointer_in_loops
 [eva] Done for function pointer_in_loops
diff --git a/tests/value/oracle/inversion.res.oracle b/tests/value/oracle/inversion.res.oracle
index 44ada0692f4c39386236c6e68d46c73a32eb622a..8b60c8e9f121ff85c545f5b9639e7d808e5b7791 100644
--- a/tests/value/oracle/inversion.res.oracle
+++ b/tests/value/oracle/inversion.res.oracle
@@ -22,8 +22,8 @@
     [2].p ∈ {{ &px }}
     [3..4] ∈ {0}
   ii[0..1] ∈ {0}
-[eva] inversion.i:23: starting to merge loop iterations
-[eva] inversion.i:30: starting to merge loop iterations
+[eva:partition] inversion.i:23: starting to merge loop iterations
+[eva:partition] inversion.i:30: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/inversion2.res.oracle b/tests/value/oracle/inversion2.res.oracle
index a58c2639c6f58f8c47b29ce79c4aaf12ab967c90..36021c572ae6aa4049cd393040faaadfa203f611 100644
--- a/tests/value/oracle/inversion2.res.oracle
+++ b/tests/value/oracle/inversion2.res.oracle
@@ -13,8 +13,8 @@
     [2][0..1] ∈ {2}
     [2][2..4] ∈ {0}
   G ∈ {99}
-[eva] inversion2.i:11: starting to merge loop iterations
-[eva] inversion2.i:10: starting to merge loop iterations
+[eva:partition] inversion2.i:11: starting to merge loop iterations
+[eva:partition] inversion2.i:10: starting to merge loop iterations
 [eva:alarm] inversion2.i:12: Warning: division by zero. assert TT[i][j] ≢ 0;
 [eva] Recording results for main
 [eva] Done for function main
diff --git a/tests/value/oracle/local_slevel.res.oracle b/tests/value/oracle/local_slevel.res.oracle
index cb2e9dae5e0e8997cc780bf104b75a7fc9185a40..b98525e706ec5cac02c8dcd976eed78526caffe2 100644
--- a/tests/value/oracle/local_slevel.res.oracle
+++ b/tests/value/oracle/local_slevel.res.oracle
@@ -9,7 +9,7 @@
 [eva] computing for function main1 <- main.
   Called from local_slevel.i:48.
 [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
-[eva] local_slevel.i:10: starting to merge loop iterations
+[eva:partition] local_slevel.i:10: starting to merge loop iterations
 [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
 [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
 [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
@@ -78,7 +78,8 @@
 [eva] local_slevel.i:37: Frama_C_show_each: {47}
 [eva] local_slevel.i:37: Frama_C_show_each: {48}
 [eva] local_slevel.i:37: Frama_C_show_each: {49}
-[eva] local_slevel.i:42: Trace partitioning superposing up to 100 states
+[eva:partition] local_slevel.i:42: 
+  Trace partitioning superposing up to 100 states
 [eva] local_slevel.i:37: Frama_C_show_each: {50}
 [eva] local_slevel.i:37: Frama_C_show_each: {51}
 [eva] local_slevel.i:37: Frama_C_show_each: {52}
@@ -129,7 +130,8 @@
 [eva] local_slevel.i:37: Frama_C_show_each: {97}
 [eva] local_slevel.i:37: Frama_C_show_each: {98}
 [eva] local_slevel.i:37: Frama_C_show_each: {99}
-[eva] local_slevel.i:42: Trace partitioning superposing up to 200 states
+[eva:partition] local_slevel.i:42: 
+  Trace partitioning superposing up to 200 states
 [eva] Recording results for main2
 [eva] Done for function main2
 [eva] Recording results for main
@@ -377,7 +379,7 @@ void main(void)
 [eva] computing for function main1 <- main.
   Called from local_slevel.i:48.
 [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
-[eva] local_slevel.i:10: starting to merge loop iterations
+[eva:partition] local_slevel.i:10: starting to merge loop iterations
 [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
 [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
 [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
@@ -446,7 +448,8 @@ void main(void)
 [eva] local_slevel.i:37: Frama_C_show_each: {47}
 [eva] local_slevel.i:37: Frama_C_show_each: {48}
 [eva] local_slevel.i:37: Frama_C_show_each: {49}
-[eva] local_slevel.i:42: Trace partitioning superposing up to 100 states
+[eva:partition] local_slevel.i:42: 
+  Trace partitioning superposing up to 100 states
 [eva] local_slevel.i:37: Frama_C_show_each: {50}
 [eva] local_slevel.i:37: Frama_C_show_each: {51}
 [eva] local_slevel.i:37: Frama_C_show_each: {52}
@@ -497,7 +500,8 @@ void main(void)
 [eva] local_slevel.i:37: Frama_C_show_each: {97}
 [eva] local_slevel.i:37: Frama_C_show_each: {98}
 [eva] local_slevel.i:37: Frama_C_show_each: {99}
-[eva] local_slevel.i:42: Trace partitioning superposing up to 200 states
+[eva:partition] local_slevel.i:42: 
+  Trace partitioning superposing up to 200 states
 [eva] Recording results for main2
 [eva] Done for function main2
 [eva] Recording results for main
diff --git a/tests/value/oracle/local_variables.res.oracle b/tests/value/oracle/local_variables.res.oracle
index 441104cedc724e860e17e463d445524e240a514c..e47f4236348e8efcafd54be49d47a800d7ed7c6b 100644
--- a/tests/value/oracle/local_variables.res.oracle
+++ b/tests/value/oracle/local_variables.res.oracle
@@ -37,7 +37,7 @@
 [eva] Done for function v
 [eva:locals-escaping] local_variables.i:35: Warning: 
   locals {x} escaping the scope of a block of main through p
-[eva] local_variables.i:43: starting to merge loop iterations
+[eva:partition] local_variables.i:43: starting to merge loop iterations
 [eva:alarm] local_variables.i:47: Warning: 
   accessing left-value that contains escaping addresses.
   assert ¬\dangling(&p);
diff --git a/tests/value/oracle/long.res.oracle b/tests/value/oracle/long.res.oracle
index 72468dec39d2f19e7f9cbca65d05154013255670..af844538b549ea909cee65734709490ff26c69c1 100644
--- a/tests/value/oracle/long.res.oracle
+++ b/tests/value/oracle/long.res.oracle
@@ -8,10 +8,10 @@
   k ∈ {0}
 [eva] computing for function f <- main.
   Called from long.i:12.
-[eva] long.i:6: starting to merge loop iterations
+[eva:partition] long.i:6: starting to merge loop iterations
 [eva] Recording results for f
 [eva] Done for function f
-[eva] long.i:11: starting to merge loop iterations
+[eva:partition] long.i:11: starting to merge loop iterations
 [eva] long.i:12: Reusing old results for call to f
 [eva] long.i:12: Reusing old results for call to f
 [eva] long.i:12: Reusing old results for call to f
diff --git a/tests/value/oracle/loop.res.oracle b/tests/value/oracle/loop.res.oracle
index 889aa41fadcf272645d023adaad5771d484e7a08..4953385a85f32b9e30ea9de8fd89effc0bc69eb3 100644
--- a/tests/value/oracle/loop.res.oracle
+++ b/tests/value/oracle/loop.res.oracle
@@ -10,7 +10,7 @@
   r ∈ {0}
   G ∈ {0}
 [eva] loop.i:8: Frama_C_show_each_F: {0}
-[eva] loop.i:7: starting to merge loop iterations
+[eva:partition] loop.i:7: starting to merge loop iterations
 [eva] loop.i:8: Frama_C_show_each_F: {0; 2}
 [eva] loop.i:8: Frama_C_show_each_F: {0; 2; 4}
 [eva] loop.i:8: Frama_C_show_each_F: [0..48],0%2
diff --git a/tests/value/oracle/loop1.res.oracle b/tests/value/oracle/loop1.res.oracle
index a924515ae9fe8683b4e091b9ff7e2ba30ff0586f..0678343c39326f5124305a0231ecf9fccfc1be51 100644
--- a/tests/value/oracle/loop1.res.oracle
+++ b/tests/value/oracle/loop1.res.oracle
@@ -15,12 +15,12 @@
 [eva] loop1.i:9: 
   cannot evaluate ACSL term, no environment to evaluate \at(_,LoopEntry)
 [eva:alarm] loop1.i:9: Warning: assertion got status unknown.
-[eva] loop1.i:5: starting to merge loop iterations
+[eva:partition] loop1.i:5: starting to merge loop iterations
 [eva] Recording results for main1
 [eva] Done for function main1
 [eva] computing for function main2 <- main.
   Called from loop1.i:26.
-[eva] loop1.i:17: starting to merge loop iterations
+[eva:partition] loop1.i:17: starting to merge loop iterations
 [eva:alarm] loop1.i:19: Warning: accessing out of bounds index. assert i < 100;
 [eva] Recording results for main2
 [eva] Done for function main2
diff --git a/tests/value/oracle/loop2.res.oracle b/tests/value/oracle/loop2.res.oracle
index 209de0a70335dd3e3d2dfd7db655bf85f81a34df..446fc15da7ccdbe2690669c83802631fa277a911 100644
--- a/tests/value/oracle/loop2.res.oracle
+++ b/tests/value/oracle/loop2.res.oracle
@@ -11,7 +11,7 @@
   r ∈ {0}
   G[0..4] ∈ {0}
   Reg5 ∈ {0}
-[eva] loop2.i:8: starting to merge loop iterations
+[eva:partition] loop2.i:8: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop3.res.oracle b/tests/value/oracle/loop3.res.oracle
index 857b1fbef23f367460ffeffb35b209d2a992706f..8b9b53e3d5a5d938fe2edffd25f77fdc6344ee63 100644
--- a/tests/value/oracle/loop3.res.oracle
+++ b/tests/value/oracle/loop3.res.oracle
@@ -10,7 +10,7 @@
   Called from loop3.c:8.
 [eva] using specification for function any_int
 [eva] Done for function any_int
-[eva] loop3.c:11: starting to merge loop iterations
+[eva:partition] loop3.c:11: starting to merge loop iterations
 [eva:alarm] loop3.c:11: Warning: signed overflow. assert j + 3 ≤ 2147483647;
 [eva:alarm] loop3.c:11: Warning: signed overflow. assert k + 8 ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/value/oracle/loop_array.res.oracle b/tests/value/oracle/loop_array.res.oracle
index 4cc2d647c7e1ac0517410abf582b1183fe9edd8c..105ab8a9199d33a1496e750c5aae8f915a6a41ba 100644
--- a/tests/value/oracle/loop_array.res.oracle
+++ b/tests/value/oracle/loop_array.res.oracle
@@ -5,9 +5,9 @@
 [eva:initial-state] Values of globals at initialization
   T[0..9999] ∈ {0}
   U[0..9999] ∈ {0}
-[eva] loop_array.i:5: starting to merge loop iterations
-[eva] loop_array.i:8: starting to merge loop iterations
-[eva] loop_array.i:12: starting to merge loop iterations
+[eva:partition] loop_array.i:5: starting to merge loop iterations
+[eva:partition] loop_array.i:8: starting to merge loop iterations
+[eva:partition] loop_array.i:12: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_join.res.oracle b/tests/value/oracle/loop_join.res.oracle
index 46a1bd4035b30017812255e9c4e6e8cadb533e0d..5b681f6493d4d3db66e1be405a6bee0870d86c8f 100644
--- a/tests/value/oracle/loop_join.res.oracle
+++ b/tests/value/oracle/loop_join.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   U[0..9999] ∈ {0}
-[eva] loop_join.i:5: starting to merge loop iterations
+[eva:partition] loop_join.i:5: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_long.res.oracle b/tests/value/oracle/loop_long.res.oracle
index 0d6902b182abdb3c8d51eb40a133bdfafbfb4277..8588ffc07d2e174899d416c8445d1d072ec3fdb2 100644
--- a/tests/value/oracle/loop_long.res.oracle
+++ b/tests/value/oracle/loop_long.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   T[0..368199] ∈ {0}
-[eva] loop_long.i:5: starting to merge loop iterations
+[eva:partition] loop_long.i:5: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_simple.res.oracle b/tests/value/oracle/loop_simple.res.oracle
index 9fa8feb4c1c87324d573663aa9dcad22c38cbfc4..54f6cb5593410eb9b63dc979c03a2f619da30fec 100644
--- a/tests/value/oracle/loop_simple.res.oracle
+++ b/tests/value/oracle/loop_simple.res.oracle
@@ -8,14 +8,14 @@
   k ∈ {0}
   n ∈ {0}
   r ∈ {0}
-[eva] loop_simple.i:26: starting to merge loop iterations
+[eva:partition] loop_simple.i:26: starting to merge loop iterations
 [eva:alarm] loop_simple.i:27: Warning: 
   signed overflow. assert (int)((int)(i + j) + k) + r ≤ 2147483647;
 [eva:alarm] loop_simple.i:27: Warning: 
   signed overflow.
   assert (int)((int)((int)(i + j) + k) + r) + 1 ≤ 2147483647;
-[eva] loop_simple.i:25: starting to merge loop iterations
-[eva] loop_simple.i:24: starting to merge loop iterations
+[eva:partition] loop_simple.i:25: starting to merge loop iterations
+[eva:partition] loop_simple.i:24: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_test.0.res.oracle b/tests/value/oracle/loop_test.0.res.oracle
index 4e7daee98e661f0fdc404a39c38cbada1ff4bb7c..bc88778640a858e3f9937bf6d741d2a271027d6a 100644
--- a/tests/value/oracle/loop_test.0.res.oracle
+++ b/tests/value/oracle/loop_test.0.res.oracle
@@ -25,52 +25,52 @@
   c9 ∈ {0}
 [eva] computing for function onze_0 <- test_onzes.
   Called from loop_test.i:43.
-[eva] loop_test.i:9: starting to merge loop iterations
+[eva:partition] loop_test.i:9: starting to merge loop iterations
 [eva] Recording results for onze_0
 [eva] Done for function onze_0
 [eva] computing for function onze_1 <- test_onzes.
   Called from loop_test.i:44.
-[eva] loop_test.i:12: starting to merge loop iterations
+[eva:partition] loop_test.i:12: starting to merge loop iterations
 [eva] Recording results for onze_1
 [eva] Done for function onze_1
 [eva] computing for function onze_2 <- test_onzes.
   Called from loop_test.i:45.
-[eva] loop_test.i:15: starting to merge loop iterations
+[eva:partition] loop_test.i:15: starting to merge loop iterations
 [eva] Recording results for onze_2
 [eva] Done for function onze_2
 [eva] computing for function onze_3 <- test_onzes.
   Called from loop_test.i:46.
-[eva] loop_test.i:18: starting to merge loop iterations
+[eva:partition] loop_test.i:18: starting to merge loop iterations
 [eva] Recording results for onze_3
 [eva] Done for function onze_3
 [eva] computing for function onze_4 <- test_onzes.
   Called from loop_test.i:47.
-[eva] loop_test.i:21: starting to merge loop iterations
+[eva:partition] loop_test.i:21: starting to merge loop iterations
 [eva] Recording results for onze_4
 [eva] Done for function onze_4
 [eva] computing for function onze_5 <- test_onzes.
   Called from loop_test.i:48.
-[eva] loop_test.i:25: starting to merge loop iterations
+[eva:partition] loop_test.i:25: starting to merge loop iterations
 [eva] Recording results for onze_5
 [eva] Done for function onze_5
 [eva] computing for function onze_6 <- test_onzes.
   Called from loop_test.i:49.
-[eva] loop_test.i:28: starting to merge loop iterations
+[eva:partition] loop_test.i:28: starting to merge loop iterations
 [eva] Recording results for onze_6
 [eva] Done for function onze_6
 [eva] computing for function onze_7 <- test_onzes.
   Called from loop_test.i:50.
-[eva] loop_test.i:31: starting to merge loop iterations
+[eva:partition] loop_test.i:31: starting to merge loop iterations
 [eva] Recording results for onze_7
 [eva] Done for function onze_7
 [eva] computing for function onze_8 <- test_onzes.
   Called from loop_test.i:51.
-[eva] loop_test.i:34: starting to merge loop iterations
+[eva:partition] loop_test.i:34: starting to merge loop iterations
 [eva] Recording results for onze_8
 [eva] Done for function onze_8
 [eva] computing for function onze_9 <- test_onzes.
   Called from loop_test.i:52.
-[eva] loop_test.i:37: starting to merge loop iterations
+[eva:partition] loop_test.i:37: starting to merge loop iterations
 [eva] Recording results for onze_9
 [eva] Done for function onze_9
 [eva] Recording results for test_onzes
diff --git a/tests/value/oracle/loop_test.1.res.oracle b/tests/value/oracle/loop_test.1.res.oracle
index f3abdc54f358beab856e2d2d7563372c4f399d6c..e2d5e19baa1c49f95af24617b49d8624ebce1f62 100644
--- a/tests/value/oracle/loop_test.1.res.oracle
+++ b/tests/value/oracle/loop_test.1.res.oracle
@@ -25,52 +25,52 @@
   c9 ∈ {0}
 [eva] computing for function cent_onze_0 <- test_cent_onzes.
   Called from loop_test.i:101.
-[eva] loop_test.i:57: starting to merge loop iterations
+[eva:partition] loop_test.i:57: starting to merge loop iterations
 [eva] Recording results for cent_onze_0
 [eva] Done for function cent_onze_0
 [eva] computing for function cent_onze_1 <- test_cent_onzes.
   Called from loop_test.i:102.
-[eva] loop_test.i:60: starting to merge loop iterations
+[eva:partition] loop_test.i:60: starting to merge loop iterations
 [eva] Recording results for cent_onze_1
 [eva] Done for function cent_onze_1
 [eva] computing for function cent_onze_2 <- test_cent_onzes.
   Called from loop_test.i:103.
-[eva] loop_test.i:64: starting to merge loop iterations
+[eva:partition] loop_test.i:64: starting to merge loop iterations
 [eva] Recording results for cent_onze_2
 [eva] Done for function cent_onze_2
 [eva] computing for function cent_onze_3 <- test_cent_onzes.
   Called from loop_test.i:104.
-[eva] loop_test.i:68: starting to merge loop iterations
+[eva:partition] loop_test.i:68: starting to merge loop iterations
 [eva] Recording results for cent_onze_3
 [eva] Done for function cent_onze_3
 [eva] computing for function cent_onze_4 <- test_cent_onzes.
   Called from loop_test.i:105.
-[eva] loop_test.i:72: starting to merge loop iterations
+[eva:partition] loop_test.i:72: starting to merge loop iterations
 [eva] Recording results for cent_onze_4
 [eva] Done for function cent_onze_4
 [eva] computing for function cent_onze_5 <- test_cent_onzes.
   Called from loop_test.i:106.
-[eva] loop_test.i:77: starting to merge loop iterations
+[eva:partition] loop_test.i:77: starting to merge loop iterations
 [eva] Recording results for cent_onze_5
 [eva] Done for function cent_onze_5
 [eva] computing for function cent_onze_6 <- test_cent_onzes.
   Called from loop_test.i:107.
-[eva] loop_test.i:80: starting to merge loop iterations
+[eva:partition] loop_test.i:80: starting to merge loop iterations
 [eva] Recording results for cent_onze_6
 [eva] Done for function cent_onze_6
 [eva] computing for function cent_onze_7 <- test_cent_onzes.
   Called from loop_test.i:108.
-[eva] loop_test.i:84: starting to merge loop iterations
+[eva:partition] loop_test.i:84: starting to merge loop iterations
 [eva] Recording results for cent_onze_7
 [eva] Done for function cent_onze_7
 [eva] computing for function cent_onze_8 <- test_cent_onzes.
   Called from loop_test.i:109.
-[eva] loop_test.i:88: starting to merge loop iterations
+[eva:partition] loop_test.i:88: starting to merge loop iterations
 [eva] Recording results for cent_onze_8
 [eva] Done for function cent_onze_8
 [eva] computing for function cent_onze_9 <- test_cent_onzes.
   Called from loop_test.i:110.
-[eva] loop_test.i:92: starting to merge loop iterations
+[eva:partition] loop_test.i:92: starting to merge loop iterations
 [eva] Recording results for cent_onze_9
 [eva] Done for function cent_onze_9
 [eva] Recording results for test_cent_onzes
diff --git a/tests/value/oracle/loop_wvar.0.res.oracle b/tests/value/oracle/loop_wvar.0.res.oracle
index e68a02c1d640c38b4a50754cf740d29700306e64..e2c2f28eec1517e6e584ad4230f7a4bbac344c46 100644
--- a/tests/value/oracle/loop_wvar.0.res.oracle
+++ b/tests/value/oracle/loop_wvar.0.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_wvar.i:13: starting to merge loop iterations
+[eva:partition] loop_wvar.i:13: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
@@ -18,7 +18,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_wvar.i:13: starting to merge loop iterations
+[eva:partition] loop_wvar.i:13: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_wvar.1.res.oracle b/tests/value/oracle/loop_wvar.1.res.oracle
index edafe26a894ece635030e2ddc5c581b4b1e5f0b7..c0e0d89a7a48d5f570d191ca844e41980696f006 100644
--- a/tests/value/oracle/loop_wvar.1.res.oracle
+++ b/tests/value/oracle/loop_wvar.1.res.oracle
@@ -6,7 +6,7 @@
   
 [eva] computing for function main_unhelpful <- main3.
   Called from loop_wvar.i:80.
-[eva] loop_wvar.i:48: starting to merge loop iterations
+[eva:partition] loop_wvar.i:48: starting to merge loop iterations
 [eva:alarm] loop_wvar.i:53: Warning: 
   signed overflow. assert next + 1 ≤ 2147483647;
 [eva] Recording results for main_unhelpful
@@ -14,7 +14,7 @@
 [eva] computing for function main_multiple_hints <- main3.
   Called from loop_wvar.i:81.
 [eva] loop_wvar.i:67: Frama_C_show_each: {0}, {0}, {0}
-[eva] loop_wvar.i:65: starting to merge loop iterations
+[eva:partition] loop_wvar.i:65: starting to merge loop iterations
 [eva] loop_wvar.i:67: Frama_C_show_each: {0; 1}, {0; 1}, {0; 1}
 [eva] loop_wvar.i:67: Frama_C_show_each: {0; 1; 2}, {0; 1; 2}, {0; 1; 2}
 [eva] loop_wvar.i:67: Frama_C_show_each: [0..9], {0; 1; 2; 3}, {0; 1; 2; 3}
diff --git a/tests/value/oracle/loop_wvar.2.res.oracle b/tests/value/oracle/loop_wvar.2.res.oracle
index 082af63bc9572d3b7e369c66975f441426ae5a62..d1c103025d42e60cf35f460b0095a5f9f8c5a247 100644
--- a/tests/value/oracle/loop_wvar.2.res.oracle
+++ b/tests/value/oracle/loop_wvar.2.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_wvar.i:24: starting to merge loop iterations
+[eva:partition] loop_wvar.i:24: starting to merge loop iterations
 [eva] Recording results for main_err1
 [eva] Done for function main_err1
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loop_wvar.3.res.oracle b/tests/value/oracle/loop_wvar.3.res.oracle
index 720baa6ea243d944f3b86c78fcb31a2d5cad0152..ac7b44f2bdbb9688f3d560942d470a86073055a0 100644
--- a/tests/value/oracle/loop_wvar.3.res.oracle
+++ b/tests/value/oracle/loop_wvar.3.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] loop_wvar.i:35: starting to merge loop iterations
+[eva:partition] loop_wvar.i:35: starting to merge loop iterations
 [eva] Recording results for main_err2
 [eva] Done for function main_err2
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/loopinv.res.oracle b/tests/value/oracle/loopinv.res.oracle
index f48234fc45cc5a04d4455045dbb416ac0da02e48..8e463e483a7bcda8985f4de6be9ed4e1388bd8b9 100644
--- a/tests/value/oracle/loopinv.res.oracle
+++ b/tests/value/oracle/loopinv.res.oracle
@@ -11,7 +11,7 @@
 [eva] loopinv.c:22: function init: precondition 'valid' got status valid.
 [eva] loopinv.c:22: function init: precondition 'c' got status valid.
 [eva] loopinv.c:9: loop invariant got status valid.
-[eva] loopinv.c:10: starting to merge loop iterations
+[eva:partition] loopinv.c:10: starting to merge loop iterations
 [eva] Recording results for init
 [eva] Done for function init
 [eva] computing for function init <- main1 <- main.
@@ -35,7 +35,7 @@
   Called from loopinv.c:82.
 [eva] loopinv.c:42: loop invariant got status valid.
 [eva] loopinv.c:46: Frama_C_show_each: {0}, {0}
-[eva] loopinv.c:43: starting to merge loop iterations
+[eva:partition] loopinv.c:43: starting to merge loop iterations
 [eva] loopinv.c:46: Frama_C_show_each: {0; 1}, {0; 1}
 [eva:alarm] loopinv.c:42: Warning: loop invariant got status unknown.
 [eva] loopinv.c:46: Frama_C_show_each: {0; 1; 2}, {0; 1; 2}
@@ -48,7 +48,7 @@
 [eva] computing for function main4 <- main.
   Called from loopinv.c:83.
 [eva] loopinv.c:58: loop invariant got status valid.
-[eva] loopinv.c:59: starting to merge loop iterations
+[eva:partition] loopinv.c:59: starting to merge loop iterations
 [eva:alarm] loopinv.c:58: Warning: loop invariant got status unknown.
 [eva] Recording results for main4
 [eva] Done for function main4
@@ -56,7 +56,7 @@
   Called from loopinv.c:84.
 [eva] loopinv.c:69: loop invariant got status valid.
 [eva] loopinv.c:71: Frama_C_show_each: {0}, {1}
-[eva] loopinv.c:70: starting to merge loop iterations
+[eva:partition] loopinv.c:70: starting to merge loop iterations
 [eva] loopinv.c:71: Frama_C_show_each: {0; 2}, {1; 2}
 [eva] loopinv.c:71: Frama_C_show_each: {0; 2; 4}, {1; 2; 3}
 [eva] loopinv.c:71: Frama_C_show_each: {0; 2; 4; 6}, [1..106]
diff --git a/tests/value/oracle/multidim-relations.res.oracle b/tests/value/oracle/multidim-relations.res.oracle
index 7db1f31483f3375d3c1e675854122b11cfad1696..7a7b7e857cc734d419d7f0f69229cdc57834efd6 100644
--- a/tests/value/oracle/multidim-relations.res.oracle
+++ b/tests/value/oracle/multidim-relations.res.oracle
@@ -9,7 +9,7 @@
   h ∈ {1}
 [eva] computing for function init_array <- main.
   Called from multidim-relations.c:35.
-[eva] multidim-relations.c:18: starting to merge loop iterations
+[eva:partition] multidim-relations.c:18: starting to merge loop iterations
 [kernel:approximation] multidim-relations.c:19: 
   more than 1(350) locations to update in array. Approximating.
 [kernel:approximation] multidim-relations.c:20: 
diff --git a/tests/value/oracle/multidim.res.oracle b/tests/value/oracle/multidim.res.oracle
index bde20fa25384bc73393a1e890d13878819f3ff9f..8c6db35d834df8bf884fba1169d9d7cf182b18fc 100644
--- a/tests/value/oracle/multidim.res.oracle
+++ b/tests/value/oracle/multidim.res.oracle
@@ -85,7 +85,7 @@
 [eva] Done for function main1
 [eva] computing for function main2 <- main.
   Called from multidim.c:188.
-[eva] multidim.c:55: starting to merge loop iterations
+[eva:partition] multidim.c:55: starting to merge loop iterations
 [eva:alarm] multidim.c:58: Warning: check got status unknown.
 [eva] multidim.c:59: 
   Frama_C_domain_show_each:
@@ -95,8 +95,8 @@
 [eva] Done for function main2
 [eva] computing for function main3 <- main.
   Called from multidim.c:189.
-[eva] multidim.c:65: starting to merge loop iterations
-[eva] multidim.c:64: starting to merge loop iterations
+[eva:partition] multidim.c:65: starting to merge loop iterations
+[eva:partition] multidim.c:64: starting to merge loop iterations
 [kernel:approximation] multidim.c:66: 
   more than 1(20) locations to update in array. Approximating.
 [kernel:approximation] multidim.c:67: 
@@ -135,8 +135,8 @@
 [eva] computing for function main4 <- main.
   Called from multidim.c:190.
 [eva:loop-unroll:partial] multidim.c:81: loop not completely unrolled
-[eva] multidim.c:81: starting to merge loop iterations
-[eva] multidim.c:83: starting to merge loop iterations
+[eva:partition] multidim.c:81: starting to merge loop iterations
+[eva:partition] multidim.c:83: starting to merge loop iterations
 [eva] multidim.c:88: 
   Frama_C_domain_show_each:
   t : # cvalue: {42}
@@ -145,7 +145,7 @@
 [eva] Done for function main4
 [eva] computing for function main5 <- main.
   Called from multidim.c:191.
-[eva] multidim.c:96: starting to merge loop iterations
+[eva:partition] multidim.c:96: starting to merge loop iterations
 [eva] multidim.c:104: 
   Frama_C_domain_show_each:
   t : # cvalue: [0..9] ∈ {0; 1}
@@ -155,7 +155,7 @@
 [eva] Done for function main5
 [eva] computing for function main6 <- main.
   Called from multidim.c:192.
-[eva] multidim.c:114: Trace partitioning superposing up to 100 states
+[eva:partition] multidim.c:114: Trace partitioning superposing up to 100 states
 [eva] multidim.c:118: 
   Frama_C_domain_show_each:
   t : # cvalue: {0}
@@ -173,7 +173,7 @@
 [eva] Done for function main6
 [eva] computing for function main7 <- main.
   Called from multidim.c:193.
-[eva] multidim.c:134: starting to merge loop iterations
+[eva:partition] multidim.c:134: starting to merge loop iterations
 [kernel:approximation] multidim.c:136: 
   more than 1(1000) locations to update in array. Approximating.
 [kernel:approximation] multidim.c:137: 
@@ -201,7 +201,7 @@
 [eva] Done for function main7
 [eva] computing for function main8 <- main.
   Called from multidim.c:194.
-[eva] multidim.c:165: starting to merge loop iterations
+[eva:partition] multidim.c:165: starting to merge loop iterations
 [eva] multidim.c:169: 
   Frama_C_domain_show_each:
   t : # cvalue: {0; 1}
@@ -210,7 +210,7 @@
 [eva] Done for function main8
 [eva] computing for function main9 <- main.
   Called from multidim.c:195.
-[eva] multidim.c:176: starting to merge loop iterations
+[eva:partition] multidim.c:176: starting to merge loop iterations
 [eva] multidim.c:182: 
   Frama_C_domain_show_each:
   t1 : # cvalue: {0} or UNINITIALIZED
diff --git a/tests/value/oracle/no_results.res.oracle b/tests/value/oracle/no_results.res.oracle
index 5d599508d1579fe1454bfd6cbbdea0544cc4426f..e3d9cae0b38225a5ff7a5f93a8abc1de4d1e6223 100644
--- a/tests/value/oracle/no_results.res.oracle
+++ b/tests/value/oracle/no_results.res.oracle
@@ -6,36 +6,57 @@
   t[0..2999] ∈ {0}
 [eva] computing for function init <- main.
   Called from no_results.c:19.
-[eva] no_results.c:10: Trace partitioning superposing up to 100 states
-[eva] no_results.c:10: Trace partitioning superposing up to 200 states
-[eva] no_results.c:10: Trace partitioning superposing up to 300 states
-[eva] no_results.c:10: Trace partitioning superposing up to 400 states
-[eva] no_results.c:10: Trace partitioning superposing up to 500 states
-[eva] no_results.c:10: Trace partitioning superposing up to 600 states
-[eva] no_results.c:10: Trace partitioning superposing up to 700 states
-[eva] no_results.c:10: Trace partitioning superposing up to 800 states
-[eva] no_results.c:10: Trace partitioning superposing up to 900 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1000 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1100 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1200 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1300 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1400 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1500 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1600 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1700 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1800 states
-[eva] no_results.c:10: Trace partitioning superposing up to 1900 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2000 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2100 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2200 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2300 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2400 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2500 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2600 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2700 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2800 states
-[eva] no_results.c:10: Trace partitioning superposing up to 2900 states
-[eva] no_results.c:10: Trace partitioning superposing up to 3000 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 100 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 200 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 300 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 400 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 500 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 600 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 700 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 800 states
+[eva:partition] no_results.c:10: Trace partitioning superposing up to 900 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1000 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1100 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1200 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1300 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1400 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1500 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1600 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1700 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1800 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 1900 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2000 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2100 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2200 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2300 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2400 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2500 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2600 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2700 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2800 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 2900 states
+[eva:partition] no_results.c:10: 
+  Trace partitioning superposing up to 3000 states
 [eva] Recording results for init
 [eva] Done for function init
 [eva] computing for function f <- main.
diff --git a/tests/value/oracle/non_natural.res.oracle b/tests/value/oracle/non_natural.res.oracle
index 740a2e0c5bb98a0f89f3383a5d0f9b2f331c9f62..421a73d73045716f78b618b2bef4224996dc9a38 100644
--- a/tests/value/oracle/non_natural.res.oracle
+++ b/tests/value/oracle/non_natural.res.oracle
@@ -49,7 +49,7 @@
   accessing uninitialized left-value.
   assert \initialized(tmp_14);
   (tmp_14 from from++)
-[eva] non_natural.i:21: starting to merge loop iterations
+[eva:partition] non_natural.i:21: starting to merge loop iterations
 [eva] non_natural.i:22: Frama_C_show_each: {{ &p2 + {0; 32} }}
 [eva] non_natural.i:22: Frama_C_show_each: {{ &p2 + {0; 32; 64} }}
 [eva] non_natural.i:22: Frama_C_show_each: {{ &p2 + {0; 32; 64; 96} }}
diff --git a/tests/value/oracle/nonlin.res.oracle b/tests/value/oracle/nonlin.res.oracle
index ea7094541b99d9a1c031590e304585d26a4faf6f..bedfb713ef6c82edddaad75721a3ac17fd413722 100644
--- a/tests/value/oracle/nonlin.res.oracle
+++ b/tests/value/oracle/nonlin.res.oracle
@@ -123,7 +123,7 @@
 [eva] computing for function subdivide_table <- main.
   Called from nonlin.c:128.
 [eva] nonlin.c:93: loop invariant got status valid.
-[eva] nonlin.c:94: starting to merge loop iterations
+[eva:partition] nonlin.c:94: starting to merge loop iterations
 [eva:nonlin] nonlin.c:95: non-linear '(4 + ((x >> 2) * 3 << 2)) + x % 4', lv 'x'
 [eva:nonlin] nonlin.c:95: subdividing on x
 [eva] Recording results for subdivide_table
diff --git a/tests/value/oracle/octagons-pointers-intermediate.res.oracle b/tests/value/oracle/octagons-pointers-intermediate.res.oracle
index 1e07542dcc317be1fa4faba97717ef2d8a4e055f..66b96ce427a1bc71a15c18ae94749dc305e909b2 100644
--- a/tests/value/oracle/octagons-pointers-intermediate.res.oracle
+++ b/tests/value/oracle/octagons-pointers-intermediate.res.oracle
@@ -8,7 +8,8 @@
   nondet ∈ [--..--]
 [eva] computing for function init <- main.
   Called from octagons-pointers-intermediate.c:38.
-[eva] octagons-pointers-intermediate.c:18: starting to merge loop iterations
+[eva:partition] octagons-pointers-intermediate.c:18: 
+  starting to merge loop iterations
 [eva] Recording results for init
 [eva] Done for function init
 [eva] computing for function cmdRead <- main.
diff --git a/tests/value/oracle/octagons-pointers-simple.res.oracle b/tests/value/oracle/octagons-pointers-simple.res.oracle
index d6690c7dd63c7830520e8910ccdc1688fd85aca3..c7821da4688765249f6ad85d1e0148df59b19585 100644
--- a/tests/value/oracle/octagons-pointers-simple.res.oracle
+++ b/tests/value/oracle/octagons-pointers-simple.res.oracle
@@ -8,7 +8,7 @@
   nondet ∈ [--..--]
 [eva] computing for function init <- main.
   Called from octagons-pointers-simple.c:38.
-[eva] octagons-pointers-simple.c:18: starting to merge loop iterations
+[eva:partition] octagons-pointers-simple.c:18: starting to merge loop iterations
 [eva] Recording results for init
 [eva] Done for function init
 [eva] octagons-pointers-simple.c:46: 
diff --git a/tests/value/oracle/octagons-pointers.res.oracle b/tests/value/oracle/octagons-pointers.res.oracle
index dfbb7337f6485aa5b04cc0d32aad07bafa9cbb7e..0c781d4eb9e1b6ede2c65741f9544a17f0a073be 100644
--- a/tests/value/oracle/octagons-pointers.res.oracle
+++ b/tests/value/oracle/octagons-pointers.res.oracle
@@ -8,7 +8,7 @@
   nondet ∈ [--..--]
 [eva] computing for function init <- main.
   Called from octagons-pointers.c:39.
-[eva] octagons-pointers.c:18: starting to merge loop iterations
+[eva:partition] octagons-pointers.c:18: starting to merge loop iterations
 [eva] Recording results for init
 [eva] Done for function init
 [eva] octagons-pointers.c:46: 
diff --git a/tests/value/oracle/octagons.res.oracle b/tests/value/oracle/octagons.res.oracle
index 4c101ae36a022f921e24cf3e5e2f4c26256a2772..f6f2e7a859449e7f09bca8ae8fb75815c7a80d28 100644
--- a/tests/value/oracle/octagons.res.oracle
+++ b/tests/value/oracle/octagons.res.oracle
@@ -149,7 +149,7 @@
 [eva] octagons.c:129: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] octagons.c:133: starting to merge loop iterations
+[eva:partition] octagons.c:133: starting to merge loop iterations
 [eva:alarm] octagons.c:134: Warning: 
   signed overflow. assert a + 2 ≤ 2147483647;
 [eva:alarm] octagons.c:135: Warning: 
@@ -292,20 +292,20 @@
 [eva] octagons.c:250: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] octagons.c:251: starting to merge loop iterations
+[eva:partition] octagons.c:251: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- arrays <- main.
   Called from octagons.c:256.
 [eva] octagons.c:256: 
   function Frama_C_interval: precondition 'order' got status valid.
 [eva] Done for function Frama_C_interval
-[eva] octagons.c:258: starting to merge loop iterations
+[eva:partition] octagons.c:258: starting to merge loop iterations
 [eva] computing for function Frama_C_float_interval <- arrays <- main.
   Called from octagons.c:265.
 [eva] using specification for function Frama_C_float_interval
 [eva] octagons.c:265: 
   function Frama_C_float_interval, behavior finite: precondition 'order' got status valid.
 [eva] Done for function Frama_C_float_interval
-[eva] octagons.c:267: starting to merge loop iterations
+[eva:partition] octagons.c:267: starting to merge loop iterations
 [eva] Recording results for arrays
 [eva] Done for function arrays
 [eva] Recording results for main
diff --git a/tests/value/oracle/offsetmap.0.res.oracle b/tests/value/oracle/offsetmap.0.res.oracle
index 06aae55336ac9d0ec151ea67bf569e499e7dec6e..894cc00cd7564cb9f406d877af2f4d9f264c4d08 100644
--- a/tests/value/oracle/offsetmap.0.res.oracle
+++ b/tests/value/oracle/offsetmap.0.res.oracle
@@ -25,8 +25,8 @@
   s[0..9999999] ∈ {0}
 [eva] computing for function f <- main.
   Called from offsetmap.i:108.
-[eva] offsetmap.i:19: starting to merge loop iterations
-[eva] offsetmap.i:29: starting to merge loop iterations
+[eva:partition] offsetmap.i:19: starting to merge loop iterations
+[eva:partition] offsetmap.i:29: starting to merge loop iterations
 [eva:alarm] offsetmap.i:51: Warning: 
   pointer downcast. assert (unsigned int)(&x2) ≤ 2147483647;
 [eva] Recording results for f
diff --git a/tests/value/oracle/offsetmap.1.res.oracle b/tests/value/oracle/offsetmap.1.res.oracle
index 6dc51d73f9deb114f896384e49bee9ec04e12459..64ad61af1a7f388bd8b30a6765fe1c14ba38f7b0 100644
--- a/tests/value/oracle/offsetmap.1.res.oracle
+++ b/tests/value/oracle/offsetmap.1.res.oracle
@@ -25,8 +25,8 @@
   s[0..9999999] ∈ {0}
 [eva] computing for function f <- main.
   Called from offsetmap.i:108.
-[eva] offsetmap.i:19: starting to merge loop iterations
-[eva] offsetmap.i:29: starting to merge loop iterations
+[eva:partition] offsetmap.i:19: starting to merge loop iterations
+[eva:partition] offsetmap.i:29: starting to merge loop iterations
 [eva:alarm] offsetmap.i:51: Warning: 
   pointer downcast. assert (unsigned int)(&x2) ≤ 2147483647;
 [eva] Recording results for f
diff --git a/tests/value/oracle/offsetmap.2.res.oracle b/tests/value/oracle/offsetmap.2.res.oracle
index da25a3bf6947d30e936409e855b61340ccc1d48b..c1d35ddae837d5ada337cc4fccb931858b45a4c7 100644
--- a/tests/value/oracle/offsetmap.2.res.oracle
+++ b/tests/value/oracle/offsetmap.2.res.oracle
@@ -25,8 +25,8 @@
   s[0..9999999] ∈ {0}
 [eva] computing for function f <- main.
   Called from offsetmap.i:108.
-[eva] offsetmap.i:19: starting to merge loop iterations
-[eva] offsetmap.i:29: starting to merge loop iterations
+[eva:partition] offsetmap.i:19: starting to merge loop iterations
+[eva:partition] offsetmap.i:29: starting to merge loop iterations
 [eva:alarm] offsetmap.i:51: Warning: 
   pointer downcast. assert (unsigned int)(&x2) ≤ 2147483647;
 [eva] Recording results for f
diff --git a/tests/value/oracle/partitioning-annots.0.res.oracle b/tests/value/oracle/partitioning-annots.0.res.oracle
index 3294c2b093f9bf1a6c502c10bd189bd06929b7cd..4677319e05cd4a2d8ca69274ab833a21abf6ffcf 100644
--- a/tests/value/oracle/partitioning-annots.0.res.oracle
+++ b/tests/value/oracle/partitioning-annots.0.res.oracle
@@ -7,21 +7,21 @@
   k ∈ {0}
 [eva] computing for function test_slevel <- main.
   Called from partitioning-annots.c:289.
-[eva] partitioning-annots.c:243: starting to merge loop iterations
-[eva] partitioning-annots.c:248: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:243: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:248: starting to merge loop iterations
 [eva] Recording results for test_slevel
 [eva] Done for function test_slevel
 [eva] computing for function test_unroll <- main.
   Called from partitioning-annots.c:290.
 [eva:loop-unroll:partial] partitioning-annots.c:26: loop not completely unrolled
-[eva] partitioning-annots.c:26: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:26: starting to merge loop iterations
 [eva:loop-unroll:partial] partitioning-annots.c:34: loop not completely unrolled
-[eva] partitioning-annots.c:34: starting to merge loop iterations
-[eva] partitioning-annots.c:36: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:34: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:36: starting to merge loop iterations
 [eva:loop-unroll:partial] partitioning-annots.c:49: loop not completely unrolled
-[eva] partitioning-annots.c:49: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:49: starting to merge loop iterations
 [eva:loop-unroll:partial] partitioning-annots.c:54: loop not completely unrolled
-[eva] partitioning-annots.c:54: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:54: starting to merge loop iterations
 [eva] Recording results for test_unroll
 [eva] Done for function test_unroll
 [eva] computing for function test_split <- main.
@@ -91,7 +91,7 @@
 [eva] Done for function test_dynamic_split
 [eva] computing for function test_dynamic_split_predicate <- main.
   Called from partitioning-annots.c:293.
-[eva] partitioning-annots.c:124: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:124: starting to merge loop iterations
 [eva] Recording results for test_dynamic_split_predicate
 [eva] Done for function test_dynamic_split_predicate
 [eva] computing for function test_splits_post_call <- main.
@@ -122,7 +122,7 @@
 [eva] computing for function test_auto_limit <- main.
   Called from partitioning-annots.c:295.
 [eva:loop-unroll:auto] partitioning-annots.c:280: Automatic loop unrolling.
-[eva] partitioning-annots.c:284: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:284: starting to merge loop iterations
 [eva] Recording results for test_auto_limit
 [eva] Done for function test_auto_limit
 [eva] Recording results for main
diff --git a/tests/value/oracle/partitioning-annots.2.res.oracle b/tests/value/oracle/partitioning-annots.2.res.oracle
index ac1dd0928fa097b817839ec19850c271a9f947aa..3d4a38d344507f5b31b3fcd8b65ca19da286214f 100644
--- a/tests/value/oracle/partitioning-annots.2.res.oracle
+++ b/tests/value/oracle/partitioning-annots.2.res.oracle
@@ -14,7 +14,7 @@
 [eva] computing for function Frama_C_interval <- test_loop_split.
   Called from partitioning-annots.c:145.
 [eva] Done for function Frama_C_interval
-[eva] partitioning-annots.c:143: starting to merge loop iterations
+[eva:partition] partitioning-annots.c:143: starting to merge loop iterations
 [eva] computing for function Frama_C_interval <- test_loop_split.
   Called from partitioning-annots.c:145.
 [eva] Done for function Frama_C_interval
diff --git a/tests/value/oracle/pointer4.res.oracle b/tests/value/oracle/pointer4.res.oracle
index 32dae30299a7b5ed2157de5af0bcf0976092a181..effa4f8a361dd78a78a4e08fb030471ba12afb8c 100644
--- a/tests/value/oracle/pointer4.res.oracle
+++ b/tests/value/oracle/pointer4.res.oracle
@@ -7,7 +7,7 @@
   d ∈ {0}
   e[0..9] ∈ {0}
   c ∈ {0}
-[eva] pointer4.i:12: starting to merge loop iterations
+[eva:partition] pointer4.i:12: starting to merge loop iterations
 [eva:alarm] pointer4.i:15: Warning: 
   out of bounds write. assert \valid((int *)0x0 + c);
 [eva] Recording results for main
diff --git a/tests/value/oracle/pointer_comparison.0.res.oracle b/tests/value/oracle/pointer_comparison.0.res.oracle
index ad9eee418586b15a7e3b5cc00c032374a5f6f0ae..9a4075e1c52ed5d3aab1bf2f1354a5431e66bba3 100644
--- a/tests/value/oracle/pointer_comparison.0.res.oracle
+++ b/tests/value/oracle/pointer_comparison.0.res.oracle
@@ -27,7 +27,7 @@
 [eva:pointer-comparison] pointer_comparison.c:23: 
   invalid pointer comparison: invalid pointer(s)
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] pointer_comparison.c:23: starting to merge loop iterations
+[eva:partition] pointer_comparison.c:23: starting to merge loop iterations
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20; 24} }}
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
diff --git a/tests/value/oracle/pointer_comparison.1.res.oracle b/tests/value/oracle/pointer_comparison.1.res.oracle
index e92341d4ebc1ef5904324703245c37763be75795..4e8c479e6fdc51a9f5e5b712947d6f234a2140b1 100644
--- a/tests/value/oracle/pointer_comparison.1.res.oracle
+++ b/tests/value/oracle/pointer_comparison.1.res.oracle
@@ -44,7 +44,7 @@
 [eva:pointer-comparison] pointer_comparison.c:23: 
   evaluating condition to {0; 1} instead of {0} because of UPCPA
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20} }}
-[eva] pointer_comparison.c:23: starting to merge loop iterations
+[eva:partition] pointer_comparison.c:23: starting to merge loop iterations
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20; 24} }}
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + {20; 24; 28} }}
 [eva] pointer_comparison.c:23: Frama_C_show_each_6: {{ &x + [20..--],0%4 }}
diff --git a/tests/value/oracle/pointer_loop.res.oracle b/tests/value/oracle/pointer_loop.res.oracle
index ed5040576f020c2b11728d7c87234ea4af19b8b7..6ae8253711a1bacf0a6cb594e523c99fd9f10972 100644
--- a/tests/value/oracle/pointer_loop.res.oracle
+++ b/tests/value/oracle/pointer_loop.res.oracle
@@ -15,7 +15,7 @@
       [1] ∈ {0}
   ACtrl[0] ∈ {{ &Ctrl[0] }}
        [1] ∈ {{ &Ctrl[1] }}
-[eva] pointer_loop.i:13: starting to merge loop iterations
+[eva:partition] pointer_loop.i:13: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/postcondition.res.oracle b/tests/value/oracle/postcondition.res.oracle
index fcfd148f70a8b458c58ae8c8daccdeb8d74be096..618629470fa6672b518e256a8ccc363f32589e90 100644
--- a/tests/value/oracle/postcondition.res.oracle
+++ b/tests/value/oracle/postcondition.res.oracle
@@ -24,7 +24,7 @@
   Called from postcondition.i:20.
 [eva] using specification for function u
 [eva] Done for function u
-[eva] postcondition.i:18: starting to merge loop iterations
+[eva:partition] postcondition.i:18: starting to merge loop iterations
 [eva] computing for function u <- get_index <- main.
   Called from postcondition.i:20.
 [eva] Done for function u
diff --git a/tests/value/oracle/precise_locations.res.oracle b/tests/value/oracle/precise_locations.res.oracle
index 872e081060b7d119737fb4bc4754de3517c861d7..d46c5437dcdd952a68eb8188fc83b00c4e0aa2be 100644
--- a/tests/value/oracle/precise_locations.res.oracle
+++ b/tests/value/oracle/precise_locations.res.oracle
@@ -8,8 +8,8 @@
   j ∈ {0}
   q ∈ {0}
   r ∈ {0}
-[eva] precise_locations.i:29: starting to merge loop iterations
-[eva] precise_locations.i:28: starting to merge loop iterations
+[eva:partition] precise_locations.i:29: starting to merge loop iterations
+[eva:partition] precise_locations.i:28: starting to merge loop iterations
 [eva] precise_locations.i:33: 
   Frama_C_dump_each:
   # cvalue:
@@ -23,17 +23,17 @@
   v ∈ [--..--]
   __retres ∈ UNINITIALIZED
   ==END OF DUMP==
-[eva] precise_locations.i:34: starting to merge loop iterations
+[eva:partition] precise_locations.i:34: starting to merge loop iterations
 [eva] computing for function ct <- main.
   Called from precise_locations.i:39.
 [eva] Recording results for ct
 [eva] Done for function ct
-[eva] precise_locations.i:38: starting to merge loop iterations
+[eva:partition] precise_locations.i:38: starting to merge loop iterations
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
-[eva] precise_locations.i:37: starting to merge loop iterations
+[eva:partition] precise_locations.i:37: starting to merge loop iterations
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
 [eva] precise_locations.i:39: Reusing old results for call to ct
@@ -162,7 +162,7 @@
 [eva] using specification for function g
 [eva] precise_locations.i:49: function g: precondition got status valid.
 [eva] Done for function g
-[eva] precise_locations.i:45: starting to merge loop iterations
+[eva:partition] precise_locations.i:45: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from precise_locations.i:48.
 [eva] Done for function f
@@ -181,7 +181,7 @@
 [eva] computing for function g <- main.
   Called from precise_locations.i:49.
 [eva] Done for function g
-[eva] precise_locations.i:44: starting to merge loop iterations
+[eva:partition] precise_locations.i:44: starting to merge loop iterations
 [eva] computing for function f <- main.
   Called from precise_locations.i:48.
 [eva] Done for function f
diff --git a/tests/value/oracle/raz.res.oracle b/tests/value/oracle/raz.res.oracle
index c17ddaa0725901ccfeac7a652c9d8eb998b324a1..1fbe1111bb3c87a1f8c9808af09bfed9bd54d840 100644
--- a/tests/value/oracle/raz.res.oracle
+++ b/tests/value/oracle/raz.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   h ∈ [--..--]
-[eva] raz.i:8: starting to merge loop iterations
+[eva:partition] raz.i:8: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/reading_null.res.oracle b/tests/value/oracle/reading_null.res.oracle
index fc1f29a182af799a1b1e4223d40a84b4c1b17b8b..559416ef96dafae7d2dbbe49d432c85d67de2697 100644
--- a/tests/value/oracle/reading_null.res.oracle
+++ b/tests/value/oracle/reading_null.res.oracle
@@ -19,7 +19,7 @@
   S_0_T[0..1] ∈ [--..--]
   S_1_T[0..1] ∈ [--..--]
 [eva] reading_null.i:25: Frama_C_show_each_F: [-2147483648..2147483647], {0}
-[eva] reading_null.i:24: starting to merge loop iterations
+[eva:partition] reading_null.i:24: starting to merge loop iterations
 [eva] reading_null.i:25: Frama_C_show_each_F: [-2147483648..2147483647], {0; 1}
 [eva] reading_null.i:25: 
   Frama_C_show_each_F: [-2147483648..2147483647], {0; 1; 2}
diff --git a/tests/value/oracle/red_alarms.res.oracle b/tests/value/oracle/red_alarms.res.oracle
index 01af779f31d48018f83d623336724334b696bbfd..6b67ce68a5b672b049dbcd44698dfba98a175700 100644
--- a/tests/value/oracle/red_alarms.res.oracle
+++ b/tests/value/oracle/red_alarms.res.oracle
@@ -51,16 +51,16 @@
   Called from red_alarms.i:97.
 [eva:alarm] red_alarms.i:45: Warning: 
   accessing out of bounds index. assert i < 32;
-[eva] red_alarms.i:47: starting to merge loop iterations
+[eva:partition] red_alarms.i:47: starting to merge loop iterations
 [eva:alarm] red_alarms.i:48: Warning: out of bounds write. assert \valid(p);
-[eva] red_alarms.i:52: starting to merge loop iterations
+[eva:partition] red_alarms.i:52: starting to merge loop iterations
 [eva:alarm] red_alarms.i:53: Warning: 
   accessing out of bounds index. assert i < 32;
 [eva:alarm] red_alarms.i:57: Warning: 
   accessing out of bounds index. assert i < 32;
 [kernel] red_alarms.i:57: Warning: 
   all target addresses were invalid. This path is assumed to be dead.
-[eva] red_alarms.i:60: starting to merge loop iterations
+[eva:partition] red_alarms.i:60: starting to merge loop iterations
 [eva:alarm] red_alarms.i:61: Warning: 
   accessing out of bounds index. assert i < 32;
 [kernel] red_alarms.i:61: Warning: 
diff --git a/tests/value/oracle/reevaluate_alarms.res.oracle b/tests/value/oracle/reevaluate_alarms.res.oracle
index 9a0cf69cf4a746e9ee0c97a5dc4c2a7a0d015af1..b31ac29c076aa2b7185d035bd84c1d62341914f0 100644
--- a/tests/value/oracle/reevaluate_alarms.res.oracle
+++ b/tests/value/oracle/reevaluate_alarms.res.oracle
@@ -8,7 +8,7 @@
   n ∈ {1}
 [eva] computing for function loop <- main.
   Called from reevaluate_alarms.i:34.
-[eva] reevaluate_alarms.i:13: starting to merge loop iterations
+[eva:partition] reevaluate_alarms.i:13: starting to merge loop iterations
 [eva:alarm] reevaluate_alarms.i:14: Warning: 
   signed overflow. assert S + i ≤ 2147483647;
 [eva:alarm] reevaluate_alarms.i:14: Warning: 
@@ -18,7 +18,7 @@
 [eva] Done for function loop
 [eva] computing for function compute_n <- main.
   Called from reevaluate_alarms.i:36.
-[eva] reevaluate_alarms.i:19: starting to merge loop iterations
+[eva:partition] reevaluate_alarms.i:19: starting to merge loop iterations
 [eva:alarm] reevaluate_alarms.i:20: Warning: 
   signed overflow. assert n * i ≤ 2147483647;
 [eva] Recording results for compute_n
diff --git a/tests/value/oracle/relations2.res.oracle b/tests/value/oracle/relations2.res.oracle
index f3cd5fc0df7ac3bd34033506b11a396ad681761f..6a5c925a9e5e3785fbd0972e072c318892b75be9 100644
--- a/tests/value/oracle/relations2.res.oracle
+++ b/tests/value/oracle/relations2.res.oracle
@@ -69,7 +69,7 @@
 [eva:alarm] relations2.i:34: Warning: 
   accessing out of bounds index.
   assert (unsigned int)(i - (unsigned int)(t + 1)) < 514;
-[eva] relations2.i:32: starting to merge loop iterations
+[eva:partition] relations2.i:32: starting to merge loop iterations
 [eva] relations2.i:33: 
   Frama_C_dump_each:
   # cvalue:
diff --git a/tests/value/oracle/semaphore.res.oracle b/tests/value/oracle/semaphore.res.oracle
index 12339ab06615a383b8a0d157b84099221cd74e6a..a3272cd7fc667380b97bb0c012df1696fca1a19d 100644
--- a/tests/value/oracle/semaphore.res.oracle
+++ b/tests/value/oracle/semaphore.res.oracle
@@ -12,7 +12,7 @@
   Called from semaphore.i:31.
 [eva] using specification for function V
 [eva] Done for function V
-[eva] semaphore.i:29: starting to merge loop iterations
+[eva:partition] semaphore.i:29: starting to merge loop iterations
 [eva] computing for function V <- g.
   Called from semaphore.i:31.
 [eva] Done for function V
@@ -22,7 +22,7 @@
 [eva] computing for function V <- g.
   Called from semaphore.i:31.
 [eva] Done for function V
-[eva] semaphore.i:28: starting to merge loop iterations
+[eva:partition] semaphore.i:28: starting to merge loop iterations
 [kernel:annot:missing-spec] semaphore.i:34: Warning: 
   Neither code nor specification for function P,
    generating default assigns. See -generated-spec-* options for more info
diff --git a/tests/value/oracle/shift_big.res.oracle b/tests/value/oracle/shift_big.res.oracle
index de17c12780cf9d3bf8030a1c9e1410b530b2b42a..4cc1d32546e3a0f31e32ea8814a9cda190b8db53 100644
--- a/tests/value/oracle/shift_big.res.oracle
+++ b/tests/value/oracle/shift_big.res.oracle
@@ -25,7 +25,7 @@
                    (tmp_0 from t2())
 [eva] computing for function t3 <- main.
   Called from shift_big.i:65.
-[eva] shift_big.i:22: starting to merge loop iterations
+[eva:partition] shift_big.i:22: starting to merge loop iterations
 [eva] shift_big.i:25: assertion got status valid.
 [eva] Recording results for t3
 [eva] Done for function t3
@@ -36,7 +36,7 @@
 [eva] Done for function t4
 [eva] computing for function t5 <- main.
   Called from shift_big.i:67.
-[eva] shift_big.i:37: starting to merge loop iterations
+[eva:partition] shift_big.i:37: starting to merge loop iterations
 [eva] shift_big.i:40: assertion got status valid.
 [eva] Recording results for t5
 [eva] Done for function t5
diff --git a/tests/value/oracle/statistics.res.oracle b/tests/value/oracle/statistics.res.oracle
index a2a50eb222a0de641a71c87a23d8ea797c9e7b7e..e53aa31daa848d2f396f9304f6064dba506232a5 100644
--- a/tests/value/oracle/statistics.res.oracle
+++ b/tests/value/oracle/statistics.res.oracle
@@ -10,7 +10,7 @@
   Called from statistics.i:13.
 [eva] Recording results for g
 [eva] Done for function g
-[eva] statistics.i:12: starting to merge loop iterations
+[eva:partition] statistics.i:12: starting to merge loop iterations
 [eva] computing for function g <- f <- main.
   Called from statistics.i:13.
 [eva] Recording results for g
diff --git a/tests/value/oracle/strings_cond.res.oracle b/tests/value/oracle/strings_cond.res.oracle
index 432a970ebd448e058f6ec1320f796411ba321561..1247b21c54909e8e46ba94877b043f4b99128527 100644
--- a/tests/value/oracle/strings_cond.res.oracle
+++ b/tests/value/oracle/strings_cond.res.oracle
@@ -12,7 +12,7 @@
   s ∈ {{ "Bla" }}
   ==END OF DUMP==
 [eva] strings_cond.i:4: Frama_C_show_each_s: {{ "Bla" }}
-[eva] strings_cond.i:4: starting to merge loop iterations
+[eva:partition] strings_cond.i:4: starting to merge loop iterations
 [eva] strings_cond.i:4: Frama_C_show_each_s: {{ "Bla" + {0; 1} }}
 [eva] strings_cond.i:4: Frama_C_show_each_s: {{ "Bla" + {0; 1; 2} }}
 [eva] Recording results for foo
diff --git a/tests/value/oracle/symbolic_locs.res.oracle b/tests/value/oracle/symbolic_locs.res.oracle
index fe83515c3c333f469c7cec17325d640acacac535..10b61d5e68aa5d06f59650c79bbb0fe92dc5ad64 100644
--- a/tests/value/oracle/symbolic_locs.res.oracle
+++ b/tests/value/oracle/symbolic_locs.res.oracle
@@ -181,7 +181,7 @@
 [eva] Done for function main6_ghost_dep
 [eva] computing for function main7_widening <- main.
   Called from symbolic_locs.i:124.
-[eva] symbolic_locs.i:110: starting to merge loop iterations
+[eva:partition] symbolic_locs.i:110: starting to merge loop iterations
 [eva] symbolic_locs.i:113: Frama_C_show_each: [10001..2147483647]
 [eva] Recording results for main7_widening
 [eva] Done for function main7_widening
diff --git a/tests/value/oracle/taint.res.oracle b/tests/value/oracle/taint.res.oracle
index ef918aac811489a69d43de04dac5113763676bbc..38bc4e3efe5a0dd38dcdb433a2ef656b69154853 100644
--- a/tests/value/oracle/taint.res.oracle
+++ b/tests/value/oracle/taint.res.oracle
@@ -171,7 +171,7 @@
   Called from taint.c:215.
 [eva:loop-unroll:auto] taint.c:157: Automatic loop unrolling.
 [eva:loop-unroll:partial] taint.c:157: loop not completely unrolled
-[eva] taint.c:157: starting to merge loop iterations
+[eva:partition] taint.c:157: starting to merge loop iterations
 [eva:alarm] taint.c:157: Warning: signed overflow. assert i + 1 ≤ 2147483647;
 [eva] taint.c:165: 
   Frama_C_dump_each:
diff --git a/tests/value/oracle/test.0.res.oracle b/tests/value/oracle/test.0.res.oracle
index 9f847abc20df15fca50b8cb5bc9719c77ce380d1..8480c5f752ccbf5207e213f65f3223283b361dc3 100644
--- a/tests/value/oracle/test.0.res.oracle
+++ b/tests/value/oracle/test.0.res.oracle
@@ -11,11 +11,11 @@
   out of bounds read. assert \valid_read(v + (int)(j + ecart));
 [eva:alarm] test.i:14: Warning: 
   out of bounds write. assert \valid(v + (int)(j + ecart));
-[eva] test.i:11: starting to merge loop iterations
-[eva] test.i:10: starting to merge loop iterations
+[eva:partition] test.i:11: starting to merge loop iterations
+[eva:partition] test.i:10: starting to merge loop iterations
 [eva:alarm] test.i:11: Warning: 
   signed overflow. assert j + ecart ≤ 2147483647;
-[eva] test.i:9: starting to merge loop iterations
+[eva:partition] test.i:9: starting to merge loop iterations
 [eva] Recording results for inst_F6
 [eva] Done for function inst_F6
 [scope:rm_asserts] removing 1 assertion(s)
diff --git a/tests/value/oracle/threat_redundant.res.oracle b/tests/value/oracle/threat_redundant.res.oracle
index 6426a9027bc588566430bccabe958405e20e9e48..96e3f3ce0c9eb3140790e7bc653b3fde0a3cc2f4 100644
--- a/tests/value/oracle/threat_redundant.res.oracle
+++ b/tests/value/oracle/threat_redundant.res.oracle
@@ -16,7 +16,7 @@
   x ∈ {0}
 [eva] computing for function strchr <- main.
   Called from threat_redundant.c:19.
-[eva] threat_redundant.c:8: starting to merge loop iterations
+[eva:partition] threat_redundant.c:8: starting to merge loop iterations
 [eva:alarm] threat_redundant.c:8: Warning: 
   out of bounds read. assert \valid_read(s);
 [eva] Recording results for strchr
diff --git a/tests/value/oracle/ulongvslonglong.0.res.oracle b/tests/value/oracle/ulongvslonglong.0.res.oracle
index 90e641cc4a386d151258e0599a301651bd6a0801..899fe67e4a757742111e039288f366a0e2a88267 100644
--- a/tests/value/oracle/ulongvslonglong.0.res.oracle
+++ b/tests/value/oracle/ulongvslonglong.0.res.oracle
@@ -6,8 +6,8 @@
   x ∈ {0}
   x2 ∈ {0}
   x9[0..5][0..1] ∈ {0}
-[eva] ulongvslonglong.i:14: starting to merge loop iterations
-[eva] ulongvslonglong.i:12: starting to merge loop iterations
+[eva:partition] ulongvslonglong.i:14: starting to merge loop iterations
+[eva:partition] ulongvslonglong.i:12: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/ulongvslonglong.1.res.oracle b/tests/value/oracle/ulongvslonglong.1.res.oracle
index f27ee0082e84e8c9cc2a69744f80fb1df11a09db..1f841f65473e500d45b3ef02021840ba110bb87d 100644
--- a/tests/value/oracle/ulongvslonglong.1.res.oracle
+++ b/tests/value/oracle/ulongvslonglong.1.res.oracle
@@ -6,8 +6,8 @@
   x ∈ {0}
   x2 ∈ {0}
   x9[0..5][0..1] ∈ {0}
-[eva] ulongvslonglong.i:14: starting to merge loop iterations
-[eva] ulongvslonglong.i:12: starting to merge loop iterations
+[eva:partition] ulongvslonglong.i:14: starting to merge loop iterations
+[eva:partition] ulongvslonglong.i:12: starting to merge loop iterations
 [eva] Recording results for main
 [eva] Done for function main
 [eva] ====== VALUES COMPUTED ======
diff --git a/tests/value/oracle/undefined_sequence.0.res.oracle b/tests/value/oracle/undefined_sequence.0.res.oracle
index d2d2868494e99b351bcd44efd2bbf610addb30aa..fd2f9bff453086dbbb7f9c6875e3815fa14ca96c 100644
--- a/tests/value/oracle/undefined_sequence.0.res.oracle
+++ b/tests/value/oracle/undefined_sequence.0.res.oracle
@@ -84,9 +84,9 @@
   H ∈ {0}
 [eva:alarm] undefined_sequence.i:35: Warning: 
   undefined multiple accesses in expression. assert \separated(&x, y);
-[eva] undefined_sequence.i:36: starting to merge loop iterations
-[eva] undefined_sequence.i:38: starting to merge loop iterations
-[eva] undefined_sequence.i:40: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:36: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:38: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:40: starting to merge loop iterations
 [eva:alarm] undefined_sequence.i:40: Warning: 
   signed overflow.
   assert G[tmp_2] + G[tmp_3] ≤ 2147483647;
diff --git a/tests/value/oracle/undefined_sequence.1.res.oracle b/tests/value/oracle/undefined_sequence.1.res.oracle
index b9c2b08d5638c675b32c2c52b6fdad05cb86dffb..fc00901135dfa119e216e07bed1464e8d05db513 100644
--- a/tests/value/oracle/undefined_sequence.1.res.oracle
+++ b/tests/value/oracle/undefined_sequence.1.res.oracle
@@ -7,21 +7,21 @@
   c ∈ [--..--]
   r ∈ {0}
   H ∈ {0}
-[eva] undefined_sequence.i:36: starting to merge loop iterations
-[eva] undefined_sequence.i:38: starting to merge loop iterations
-[eva] undefined_sequence.i:40: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:36: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:38: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:40: starting to merge loop iterations
 [eva:alarm] undefined_sequence.i:40: Warning: 
   signed overflow.
   assert G[tmp_2] + G[tmp_3] ≤ 2147483647;
   (tmp_2 from j++, tmp_3 from i++)
-[eva] undefined_sequence.i:43: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:43: starting to merge loop iterations
 [eva:alarm] undefined_sequence.i:50: Warning: 
   signed overflow. assert G[j] + G[tmp_6] ≤ 2147483647;
                    (tmp_6 from j++)
 [eva:alarm] undefined_sequence.i:51: Warning: 
   signed overflow. assert G[tmp_7] + G[i] ≤ 2147483647;
                    (tmp_7 from i++)
-[eva] undefined_sequence.i:49: starting to merge loop iterations
+[eva:partition] undefined_sequence.i:49: starting to merge loop iterations
 [eva] computing for function g <- main.
   Called from undefined_sequence.i:53.
 [eva] Recording results for g
diff --git a/tests/value/oracle/unroll.res.oracle b/tests/value/oracle/unroll.res.oracle
index c36bdf2bce155daeb3624c34432aba55098370b2..8ef0f44695ac7c5ce09a8788641467aee7afdc8c 100644
--- a/tests/value/oracle/unroll.res.oracle
+++ b/tests/value/oracle/unroll.res.oracle
@@ -9,7 +9,7 @@
   t_biosmap[0..9] ∈ {0}
   g_biosmap ∈ {{ &t_biosmap[0] }}
   biosmap ∈ {0}
-[eva] unroll.i:31: starting to merge loop iterations
+[eva:partition] unroll.i:31: starting to merge loop iterations
 [eva:alarm] unroll.i:34: Warning: signed overflow. assert -2147483648 ≤ j - 1;
 [eva:alarm] unroll.i:32: Warning: signed overflow. assert G + i ≤ 2147483647;
 [eva] Recording results for main
diff --git a/tests/value/oracle/unroll_simple.res.oracle b/tests/value/oracle/unroll_simple.res.oracle
index 503c58f70d4d7da6f10ede70c1c62bf1c38896fc..83ff93f306ac15f8c1e5b983c628590a0ce5ed8e 100644
--- a/tests/value/oracle/unroll_simple.res.oracle
+++ b/tests/value/oracle/unroll_simple.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] unroll_simple.i:8: starting to merge loop iterations
+[eva:partition] unroll_simple.i:8: starting to merge loop iterations
 [eva:alarm] unroll_simple.i:11: Warning: 
   signed overflow. assert -2147483648 ≤ j - 1;
 [eva:alarm] unroll_simple.i:9: Warning: 
diff --git a/tests/value/oracle/user_assertion_uninit_var.res.oracle b/tests/value/oracle/user_assertion_uninit_var.res.oracle
index 50cab91e31c16086addae18acfe2564f7c9f8e12..71513eb7d12a41c4d303e0b2c61a5154ef7a321c 100644
--- a/tests/value/oracle/user_assertion_uninit_var.res.oracle
+++ b/tests/value/oracle/user_assertion_uninit_var.res.oracle
@@ -4,7 +4,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] user_assertion_uninit_var.i:3: starting to merge loop iterations
+[eva:partition] user_assertion_uninit_var.i:3: starting to merge loop iterations
 [eva:alarm] user_assertion_uninit_var.i:4: Warning: 
   assertion got status unknown.
 [eva:alarm] user_assertion_uninit_var.i:6: Warning: 
diff --git a/tests/value/oracle/va_list2.0.res.oracle b/tests/value/oracle/va_list2.0.res.oracle
index c957328829e25d2ac3d408b799ef17760dce973c..7ea1da5637ab9507edd09bfd7345546f87c7f91a 100644
--- a/tests/value/oracle/va_list2.0.res.oracle
+++ b/tests/value/oracle/va_list2.0.res.oracle
@@ -26,7 +26,7 @@
                           (tmp_0 from vararg)
 [eva] va_list2.c:21: 
   Frama_C_show_each_f: {{ garbled mix of &{S_0_S___va_params} (origin: Well) }}
-[eva] va_list2.c:12: starting to merge loop iterations
+[eva:partition] va_list2.c:12: starting to merge loop iterations
 [eva:alarm] va_list2.c:13: Warning: out of bounds read. assert \valid_read(fmt);
 [eva] va_list2.c:16: 
   Frama_C_show_each_i:
diff --git a/tests/value/oracle/va_list2.1.res.oracle b/tests/value/oracle/va_list2.1.res.oracle
index ca15a17bee84a7edcee663767a63a0e96ef2af49..134e514df9bec65e37ea36c6fc101f598d31543f 100644
--- a/tests/value/oracle/va_list2.1.res.oracle
+++ b/tests/value/oracle/va_list2.1.res.oracle
@@ -30,7 +30,7 @@
                           (tmp_0 from vararg)
 [eva] va_list2.c:21: 
   Frama_C_show_each_f: [-3.40282346639e+38 .. 3.40282346639e+38]
-[eva] va_list2.c:12: starting to merge loop iterations
+[eva:partition] va_list2.c:12: starting to merge loop iterations
 [eva:alarm] va_list2.c:13: Warning: out of bounds read. assert \valid_read(fmt);
 [eva] computing for function __builtin_va_arg <- main.
   Called from va_list2.c:15.
diff --git a/tests/value/oracle/widen_non_constant.res.oracle b/tests/value/oracle/widen_non_constant.res.oracle
index a731f49ad08979aaa09a10914c833d4c48dbf44e..f6467037e84a9b923287850df9912102c027d19c 100644
--- a/tests/value/oracle/widen_non_constant.res.oracle
+++ b/tests/value/oracle/widen_non_constant.res.oracle
@@ -13,11 +13,11 @@
   Called from widen_non_constant.i:97.
 [eva] widen_non_constant.i:11: Frama_C_show_each_out: {0}
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1}
-[eva] widen_non_constant.i:12: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:12: starting to merge loop iterations
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1; 2}
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0}, {1; 2; 3}
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0}, [1..23]
-[eva] widen_non_constant.i:10: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:10: starting to merge loop iterations
 [eva] widen_non_constant.i:11: Frama_C_show_each_out: {0; 1}
 [eva] widen_non_constant.i:13: Frama_C_show_each_in: {0; 1}, [1..23]
 [eva] widen_non_constant.i:11: Frama_C_show_each_out: {0; 1; 2}
@@ -30,11 +30,11 @@
   Called from widen_non_constant.i:98.
 [eva] widen_non_constant.i:27: Frama_C_show_each_out: {0}
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1}
-[eva] widen_non_constant.i:28: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:28: starting to merge loop iterations
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1; 2}
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0}, {1; 2; 3}
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0}, [1..23]
-[eva] widen_non_constant.i:26: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:26: starting to merge loop iterations
 [eva] widen_non_constant.i:27: Frama_C_show_each_out: {0; 1}
 [eva] widen_non_constant.i:29: Frama_C_show_each_in: {0; 1}, [1..23]
 [eva] widen_non_constant.i:27: Frama_C_show_each_out: {0; 1; 2}
@@ -47,11 +47,11 @@
   Called from widen_non_constant.i:99.
 [eva] widen_non_constant.i:46: Frama_C_show_each_out: {0}
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1}
-[eva] widen_non_constant.i:47: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:47: starting to merge loop iterations
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1; 2}
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0}, {1; 2; 3}
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0}, [1..23]
-[eva] widen_non_constant.i:45: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:45: starting to merge loop iterations
 [eva] widen_non_constant.i:46: Frama_C_show_each_out: {0; 1}
 [eva] widen_non_constant.i:48: Frama_C_show_each_in: {0; 1}, [1..23]
 [eva] widen_non_constant.i:46: Frama_C_show_each_out: {0; 1; 2}
@@ -62,17 +62,17 @@
 [eva] Done for function main3
 [eva] computing for function main4 <- main.
   Called from widen_non_constant.i:100.
-[eva] widen_non_constant.i:63: starting to merge loop iterations
-[eva] widen_non_constant.i:69: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:63: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:69: starting to merge loop iterations
 [eva] widen_non_constant.i:72: Frama_C_show_each: {43}
-[eva] widen_non_constant.i:75: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:75: starting to merge loop iterations
 [eva] widen_non_constant.i:78: 
   Frama_C_show_each: {35; 36; 37; 38; 39; 40; 41; 42}
 [eva] Recording results for main4
 [eva] Done for function main4
 [eva] computing for function main5 <- main.
   Called from widen_non_constant.i:101.
-[eva] widen_non_constant.i:90: starting to merge loop iterations
+[eva:partition] widen_non_constant.i:90: starting to merge loop iterations
 [eva] Recording results for main5
 [eva] Done for function main5
 [eva] Recording results for main
diff --git a/tests/value/oracle/widen_on_non_monotonic.res.oracle b/tests/value/oracle/widen_on_non_monotonic.res.oracle
index 8e040db5b0c2f1ca0f1f189954d3d4bb1af61d70..c1948c37c5f3db537c6763e282911c3ec2289968 100644
--- a/tests/value/oracle/widen_on_non_monotonic.res.oracle
+++ b/tests/value/oracle/widen_on_non_monotonic.res.oracle
@@ -18,9 +18,9 @@
   k ∈ {0}
 [eva] computing for function main1 <- main.
   Called from widen_on_non_monotonic.i:71.
-[eva] widen_on_non_monotonic.i:25: starting to merge loop iterations
-[eva] widen_on_non_monotonic.i:23: starting to merge loop iterations
-[eva] widen_on_non_monotonic.i:26: starting to merge loop iterations
+[eva:partition] widen_on_non_monotonic.i:25: starting to merge loop iterations
+[eva:partition] widen_on_non_monotonic.i:23: starting to merge loop iterations
+[eva:partition] widen_on_non_monotonic.i:26: starting to merge loop iterations
 [eva:alarm] widen_on_non_monotonic.i:27: Warning: 
   signed overflow. assert -2147483648 ≤ b - 1;
 [eva] Recording results for main1
diff --git a/tests/value/oracle/widen_overflow.res.oracle b/tests/value/oracle/widen_overflow.res.oracle
index 6601f0800a90e5b8b6433796c6bf2e1008b7bb8e..72f23a8c5c46fe4ca8fbe80bf567eee28f9a1bf2 100644
--- a/tests/value/oracle/widen_overflow.res.oracle
+++ b/tests/value/oracle/widen_overflow.res.oracle
@@ -14,7 +14,7 @@
   Called from widen_overflow.i:9.
 [eva] using specification for function u
 [eva] Done for function u
-[eva] widen_overflow.i:9: starting to merge loop iterations
+[eva:partition] widen_overflow.i:9: starting to merge loop iterations
 [eva] computing for function u <- main.
   Called from widen_overflow.i:9.
 [eva] Done for function u
diff --git a/tests/value/oracle/widening_thresholds.res.oracle b/tests/value/oracle/widening_thresholds.res.oracle
index 27a216ec20ae7dbdb7292226e78395a427198d65..9c06a0c9331d93ffe642c737a5fc561568287e2e 100644
--- a/tests/value/oracle/widening_thresholds.res.oracle
+++ b/tests/value/oracle/widening_thresholds.res.oracle
@@ -11,7 +11,7 @@
   Called from widening_thresholds.i:21.
 [eva] Recording results for incr_modulo
 [eva] Done for function incr_modulo
-[eva] widening_thresholds.i:18: starting to merge loop iterations
+[eva:partition] widening_thresholds.i:18: starting to merge loop iterations
 [eva] computing for function incr_modulo <- modulo <- main.
   Called from widening_thresholds.i:21.
 [eva] Recording results for incr_modulo
diff --git a/tests/value/oracle/with_comment.res.oracle b/tests/value/oracle/with_comment.res.oracle
index 32d3b2dde245eab24117d924e6fe8340431818a9..27692476ab9e46e9751f3ab11090debcf70072d9 100644
--- a/tests/value/oracle/with_comment.res.oracle
+++ b/tests/value/oracle/with_comment.res.oracle
@@ -5,7 +5,7 @@
 [eva:initial-state] Values of globals at initialization
   HHH ∈ {0}
   G ∈ {0}
-[eva] with_comment.i:20: starting to merge loop iterations
+[eva:partition] with_comment.i:20: starting to merge loop iterations
 [eva:alarm] with_comment.i:21: Warning: 
   signed overflow. assert G + 1 ≤ 2147483647;
 [eva] Recording results for main2
diff --git a/tests/value/oracle_apron/auto_loop_unroll.0.res.oracle b/tests/value/oracle_apron/auto_loop_unroll.0.res.oracle
index 252285814d79648e5748107e6e1821616405d072..3942f9023790c871b5478f4884ba3769cdc4ce62 100644
--- a/tests/value/oracle_apron/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle_apron/auto_loop_unroll.0.res.oracle
@@ -16,119 +16,119 @@
 < [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-29,31c23
+30,32c24
 < [eva:alarm] auto_loop_unroll.c:58: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: {64}
-33,35c25
+34,36c26
 < [eva:alarm] auto_loop_unroll.c:63: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..120]
-37,39c27
+38,40c28
 < [eva:alarm] auto_loop_unroll.c:69: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..160]
-41,43c29
+42,44c30
 < [eva:alarm] auto_loop_unroll.c:76: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..164]
-51,52d36
+52,53d37
 < [eva:alarm] auto_loop_unroll.c:88: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-55,57c39
+56,58c40
 < [eva:alarm] auto_loop_unroll.c:93: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:95: Frama_C_show_each_101: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:95: Frama_C_show_each_101: {101}
-66c48,51
+67c49,52
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-76c61,64
+77c62,65
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-85c73,76
+86c74,77
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-102c93,96
+103c94,97
 < [eva] auto_loop_unroll.c:100: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:100.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-109,110d102
+110,111d103
 < [eva:alarm] auto_loop_unroll.c:14: Warning: 
 <   signed overflow. assert g + 1 ≤ 2147483647;
-113c105,108
+114c106,109
 < [eva] auto_loop_unroll.c:100: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:100.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-116,117d110
+117,118d111
 < [eva:alarm] auto_loop_unroll.c:18: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
-120c113
+121c114
 < [eva] auto_loop_unroll.c:103: Frama_C_show_each_25: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:103: Frama_C_show_each_25: {25}
-126c119
+127c120
 < [eva] auto_loop_unroll.c:112: Frama_C_show_each_120: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:112: Frama_C_show_each_120: [15..2147483647]
-128,130c121
+129,131c122
 < [eva:alarm] auto_loop_unroll.c:120: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [0..65]
-132,134c123
+133,135c124
 < [eva:alarm] auto_loop_unroll.c:130: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:132: Frama_C_show_each_1_28: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:132: Frama_C_show_each_1_28: [0..29]
-138c127
+139c128
 < [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [3..2147483647]
-149,151c138
+150,152c139
 < [eva:alarm] auto_loop_unroll.c:165: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..65]
-156c143
+157c144
 < [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [64..2147483647]
-160c147
+161c148
 < [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [10..2147483647]
-178,182c165,173
+179,183c166,174
 < [eva] auto_loop_unroll.c:193: Reusing old results for call to incr_g
 < [eva] auto_loop_unroll.c:193: Reusing old results for call to incr_g
 < [eva:alarm] auto_loop_unroll.c:195: Warning: 
@@ -144,82 +144,82 @@
 > [eva] Recording results for incr_g
 > [eva] Done for function incr_g
 > [eva] auto_loop_unroll.c:197: Frama_C_show_each_imprecise: [0..64]
-184,186c175
+185,187c176
 < [eva:alarm] auto_loop_unroll.c:204: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..9]
-188,189d176
+189,190d177
 < [eva:alarm] auto_loop_unroll.c:212: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-192c179
+193c180
 < [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [64..2147483647]
-198,200c185
+199,201c186
 < [eva:alarm] auto_loop_unroll.c:224: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: {11}
-202,204c187
+203,205c188
 < [eva:alarm] auto_loop_unroll.c:229: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: {12}
-206,207d188
+207,208d189
 < [eva:alarm] auto_loop_unroll.c:235: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-209a191,192
+210a192,193
 > [eva:alarm] auto_loop_unroll.c:235: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-212,213d194
+213,214d195
 < [eva:alarm] auto_loop_unroll.c:240: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-215a197,198
+216a198,199
 > [eva:alarm] auto_loop_unroll.c:240: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-218,219d200
+219,220d201
 < [eva:alarm] auto_loop_unroll.c:248: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-222,224c203
+223,225c204
 < [eva:alarm] auto_loop_unroll.c:253: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [11..111]
-226,228c205
+227,229c206
 < [eva:alarm] auto_loop_unroll.c:263: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [16..2147483647]
-236,238c213
+237,239c214
 < [eva:alarm] auto_loop_unroll.c:275: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [20..2147483646]
-240,241d214
+241,242d215
 < [eva:alarm] auto_loop_unroll.c:280: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-244,246c217
+245,247c218
 < [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: [0..2147483647]
-< [eva] auto_loop_unroll.c:284: starting to merge loop iterations
+< [eva:partition] auto_loop_unroll.c:284: starting to merge loop iterations
 < [eva:alarm] auto_loop_unroll.c:286: Warning: 
 ---
 > [eva:alarm] auto_loop_unroll.c:280: Warning: 
-248,250c219,221
+249,251c220,222
 < [eva:alarm] auto_loop_unroll.c:284: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:288: Frama_C_show_each_22: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: {21}
-> [eva] auto_loop_unroll.c:284: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:284: starting to merge loop iterations
 > [eva] auto_loop_unroll.c:288: Frama_C_show_each_22: {21; 22}
-252,256c223
+253,257c224
 < [eva:alarm] auto_loop_unroll.c:294: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:291: Warning: 
@@ -227,94 +227,94 @@
 < [eva] auto_loop_unroll.c:296: Frama_C_show_each_23: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:296: Frama_C_show_each_23: {22; 23}
-260,262c227
+261,263c228
 < [eva:alarm] auto_loop_unroll.c:299: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:304: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:304: Frama_C_show_each_top: [23..2147483647]
-268,270c233,234
+269,271c234,235
 < [eva:alarm] auto_loop_unroll.c:311: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: {30}
-> [eva] auto_loop_unroll.c:319: starting to merge loop iterations
-273,274c237
-< [eva] auto_loop_unroll.c:319: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
+274,275c238
+< [eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
 < [eva] auto_loop_unroll.c:324: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:324: Frama_C_show_each_top: [31..2147483647]
-276,278c239
+277,279c240
 < [eva:alarm] auto_loop_unroll.c:328: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: {32}
-282c243
+283c244
 < [eva] auto_loop_unroll.c:341: Frama_C_show_each_33_inf: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:341: Frama_C_show_each_33_inf: [33..2147483647]
-286,287d246
+287,288d247
 < [eva:alarm] auto_loop_unroll.c:344: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-290,292c249
+291,293c250
 < [eva:alarm] auto_loop_unroll.c:355: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..35]
-295,296d251
+296,297d252
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:360: Warning: 
-298,300c253
+299,301c254
 < [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: [0..2147483647]
-< [eva] auto_loop_unroll.c:367: starting to merge loop iterations
+< [eva:partition] auto_loop_unroll.c:367: starting to merge loop iterations
 < [eva:alarm] auto_loop_unroll.c:370: Warning: 
 ---
 > [eva:alarm] auto_loop_unroll.c:360: Warning: 
-302c255,257
+303c256,258
 < [eva] auto_loop_unroll.c:372: Frama_C_show_each_27: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: {36}
-> [eva] auto_loop_unroll.c:367: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:367: starting to merge loop iterations
 > [eva] auto_loop_unroll.c:372: Frama_C_show_each_27: [0..37]
-307,309c262
+308,310c263
 < [eva:alarm] auto_loop_unroll.c:383: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:387: Frama_C_show_each_50: [1..2147483647]
 ---
 > [eva] auto_loop_unroll.c:387: Frama_C_show_each_50: {50}
-312,313d264
+313,314d265
 < [eva:alarm] auto_loop_unroll.c:392: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-320,323d270
+321,324d271
 < [eva:alarm] auto_loop_unroll.c:404: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:408: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
-325c272
+326c273
 < [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: {30}
-327,330d273
+328,331d274
 < [eva:alarm] auto_loop_unroll.c:415: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:419: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
-332c275
+333c276
 < [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: {30}
-342c285
+343c286
 <   __retres ∈ [1..2147483647]
 ---
 >   __retres ∈ [1..25]
-344c287
+345c288
 <   g ∈ [1..2147483647]
 ---
 >   g ∈ [1..126]
-372c315
+373c316
 <   k ∈ [22..2147483647]
 ---
 >   k ∈ {22}
diff --git a/tests/value/oracle_apron/auto_loop_unroll.1.res.oracle b/tests/value/oracle_apron/auto_loop_unroll.1.res.oracle
index 6fca7af402ccf6e5b374c2a6a46e3722d392c47a..7b08aa986c07facbd92f30bcd3bf378512ed896e 100644
--- a/tests/value/oracle_apron/auto_loop_unroll.1.res.oracle
+++ b/tests/value/oracle_apron/auto_loop_unroll.1.res.oracle
@@ -1,209 +1,209 @@
-14,16c14
+15,17c15
 < [eva:alarm] auto_loop_unroll.c:31: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: {1000}
-18,20c16
+19,21c17
 < [eva:alarm] auto_loop_unroll.c:39: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-54c50,53
+56c52,55
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-63c62,65
+65c64,67
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-72c74,77
+74c76,79
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-81c86,89
+83c88,91
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-90c98,101
+92c100,103
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-99c110,113
+101c112,115
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-108c122,125
+110c124,127
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-117c134,137
+119c136,139
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-126c146,149
+128c148,151
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-135c158,161
+137c160,163
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-144c170,173
+146c172,175
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-153c182,185
+155c184,187
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-162c194,197
+164c196,199
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-171c206,209
+173c208,211
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-180c218,221
+182c220,223
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-189c230,233
+191c232,235
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-198c242,245
+200c244,247
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-207c254,257
+209c256,259
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-216c266,269
+218c268,271
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-225c278,281
+227c280,283
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-234c290,293
+236c292,295
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-243c302,305
+245c304,307
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-252c314,317
+254c316,319
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-261c326,329
+263c328,331
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-270c338,341
+272c340,343
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-282c353
+284c355
 < [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:141: Frama_C_show_each_top: [3..2147483647]
-293,295c364
+295,297c366
 < [eva:alarm] auto_loop_unroll.c:165: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:168: Frama_C_show_each_imprecise: [0..65]
-300c369
+302c371
 < [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:179: Frama_C_show_each_imprecise: [64..2147483647]
-304c373
+306c375
 < [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:188: Frama_C_show_each_imprecise: [10..2147483647]
-322,326c391,399
+324,328c393,401
 < [eva] auto_loop_unroll.c:193: Reusing old results for call to incr_g
 < [eva] auto_loop_unroll.c:193: Reusing old results for call to incr_g
 < [eva:alarm] auto_loop_unroll.c:195: Warning: 
@@ -219,28 +219,28 @@
 > [eva] Recording results for incr_g
 > [eva] Done for function incr_g
 > [eva] auto_loop_unroll.c:197: Frama_C_show_each_imprecise: [0..64]
-328,330c401
+330,332c403
 < [eva:alarm] auto_loop_unroll.c:204: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..9]
-332,333d402
+334,335d404
 < [eva:alarm] auto_loop_unroll.c:212: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-336c405
+338c407
 < [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [64..2147483647]
-341c410
+343c412
 < [eva:loop-unroll:auto] auto_loop_unroll.c:223: Automatic loop unrolling.
 ---
-> [eva] auto_loop_unroll.c:223: starting to merge loop iterations
-343c412
+> [eva:partition] auto_loop_unroll.c:223: starting to merge loop iterations
+345c414
 < [eva:loop-unroll:auto] auto_loop_unroll.c:228: Automatic loop unrolling.
 ---
-> [eva] auto_loop_unroll.c:228: starting to merge loop iterations
-345,350c414,427
+> [eva:partition] auto_loop_unroll.c:228: starting to merge loop iterations
+347,352c416,429
 < [eva:loop-unroll:auto] auto_loop_unroll.c:234: Automatic loop unrolling.
 < [eva] auto_loop_unroll.c:237: Frama_C_show_each_0_13: [0..13]
 < [eva:loop-unroll:auto] auto_loop_unroll.c:239: Automatic loop unrolling.
@@ -248,61 +248,61 @@
 < [eva:loop-unroll:auto] auto_loop_unroll.c:245: Automatic loop unrolling.
 < [eva] auto_loop_unroll.c:250: Frama_C_show_each_0_15: [0..15]
 ---
-> [eva] auto_loop_unroll.c:234: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:234: starting to merge loop iterations
 > [eva:alarm] auto_loop_unroll.c:234: Warning: 
 >   signed overflow. assert -2147483648 ≤ i_0 - 1;
 > [eva:alarm] auto_loop_unroll.c:235: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:237: Frama_C_show_each_0_13: [0..2147483647]
-> [eva] auto_loop_unroll.c:239: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:239: starting to merge loop iterations
 > [eva:alarm] auto_loop_unroll.c:239: Warning: 
 >   signed overflow. assert -2147483648 ≤ i_1 - 1;
 > [eva:alarm] auto_loop_unroll.c:240: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:242: Frama_C_show_each_0_14: [0..2147483647]
-> [eva] auto_loop_unroll.c:245: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:245: starting to merge loop iterations
 > [eva] auto_loop_unroll.c:250: Frama_C_show_each_0_15: [0..2147483647]
-362c439,443
+365c442,446
 < [eva:loop-unroll:auto] auto_loop_unroll.c:279: Automatic loop unrolling.
 ---
-> [eva] auto_loop_unroll.c:279: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:279: starting to merge loop iterations
 > [eva:alarm] auto_loop_unroll.c:279: Warning: 
 >   signed overflow. assert -2147483648 ≤ i - 1;
 > [eva:alarm] auto_loop_unroll.c:280: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-371,373c452
+374,376c455
 < [eva:alarm] auto_loop_unroll.c:299: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:304: Frama_C_show_each_top: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:304: Frama_C_show_each_top: [23..2147483647]
-395,396d473
+399,400d477
 < [eva:alarm] auto_loop_unroll.c:344: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-400c477,481
+404c481,485
 < [eva:loop-unroll:auto] auto_loop_unroll.c:360: Automatic loop unrolling.
 ---
-> [eva] auto_loop_unroll.c:360: starting to merge loop iterations
+> [eva:partition] auto_loop_unroll.c:360: starting to merge loop iterations
 > [eva:alarm] auto_loop_unroll.c:360: Warning: 
 >   signed overflow. assert -2147483648 ≤ i - 1;
 > [eva:alarm] auto_loop_unroll.c:360: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-410,411c491,493
+414,415c495,497
 < [eva:loop-unroll:auto] auto_loop_unroll.c:391: Automatic loop unrolling.
 < [eva] auto_loop_unroll.c:395: Frama_C_show_each_1_51: [1..51]
 ---
 > [eva:alarm] auto_loop_unroll.c:391: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:395: Frama_C_show_each_1_51: [1..2147483647]
-421c503
+425c507
 < [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [15..45]
 ---
 > [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: {30}
-429c511
+433c515
 <   j ∈ [15..45]
 ---
 >   j ∈ [15..30]
-454c536
+458c540
 <   i ∈ [-1..50]
 ---
 >   i ∈ [-2147483648..50]
diff --git a/tests/value/oracle_apron/local_slevel.res.oracle b/tests/value/oracle_apron/local_slevel.res.oracle
index 7dc46e0160ad7640f01c309fe06503d23965be15..d51410f599c6adee65adb557373aad659f37ef40 100644
--- a/tests/value/oracle_apron/local_slevel.res.oracle
+++ b/tests/value/oracle_apron/local_slevel.res.oracle
@@ -24,11 +24,11 @@
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [1..79]
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-140c136
+142c138
 <   r ∈ [--..--]
 ---
 >   r ∈ [0..2147483647]
-381,383c377,379
+383,385c379,381
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
 < [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
@@ -36,15 +36,15 @@
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-385c381
+387c383
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3}
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3}
-387c383
+389c385
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3; 4}
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3; 4}
-389,394c385,386
+391,396c387,388
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [0..2147483647]
 < [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483647]
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [0..2147483648]
@@ -54,7 +54,7 @@
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [1..79]
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-508c500
+512c504
 <   r ∈ [--..--]
 ---
 >   r ∈ [0..2147483647]
diff --git a/tests/value/oracle_apron/octagons-pointers-simple.res.oracle b/tests/value/oracle_apron/octagons-pointers-simple.res.oracle
index c976f8080e08fd8a1562ddb133889ddac757a32f..8a2d258b9f9af3d40947fb28d7337e32204a7c90 100644
--- a/tests/value/oracle_apron/octagons-pointers-simple.res.oracle
+++ b/tests/value/oracle_apron/octagons-pointers-simple.res.oracle
@@ -1,5 +1,5 @@
 39a40,53
-> [eva] octagons-pointers-simple.c:43: starting to merge loop iterations
+> [eva:partition] octagons-pointers-simple.c:43: starting to merge loop iterations
 > [eva] octagons-pointers-simple.c:46: 
 >   Frama_C_dump_each:
 >   # octagon:
diff --git a/tests/value/oracle_apron/widen_on_non_monotonic.res.oracle b/tests/value/oracle_apron/widen_on_non_monotonic.res.oracle
index 4d6e687c99315169af3b5a4603f2f7eb244d26d0..3b20bdeaea619b97b845a408a93b927b9fae01eb 100644
--- a/tests/value/oracle_apron/widen_on_non_monotonic.res.oracle
+++ b/tests/value/oracle_apron/widen_on_non_monotonic.res.oracle
@@ -1,2 +1,2 @@
 25a26
-> [eva] widen_on_non_monotonic.i:21: starting to merge loop iterations
+> [eva:partition] widen_on_non_monotonic.i:21: starting to merge loop iterations
diff --git a/tests/value/oracle_equality/alias.5.res.oracle b/tests/value/oracle_equality/alias.5.res.oracle
index 7e9d6756cbbfab00239a7fddd99290aa7b420c21..ed9bb3d7582fa74b7154039b95cccb377d0e804c 100644
--- a/tests/value/oracle_equality/alias.5.res.oracle
+++ b/tests/value/oracle_equality/alias.5.res.oracle
@@ -1,5 +1,5 @@
 59a60
-> [eva] alias.i:260: starting to merge loop iterations
+> [eva:partition] alias.i:260: starting to merge loop iterations
 167c168
 <   y ∈ {0; 3; 77}
 ---
diff --git a/tests/value/oracle_equality/auto_loop_unroll.0.res.oracle b/tests/value/oracle_equality/auto_loop_unroll.0.res.oracle
index 73c9dc2735a60f22c55b4610f9128304cd63567a..8f94c123dd3f3a6099d03c8f38c36df7d951dd94 100644
--- a/tests/value/oracle_equality/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle_equality/auto_loop_unroll.0.res.oracle
@@ -1,11 +1,11 @@
-76c76,79
+77c77,80
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
 >   Called from auto_loop_unroll.c:101.
 > [eva] Recording results for incr
 > [eva] Done for function incr
-85c88,91
+86c89,92
 < [eva] auto_loop_unroll.c:101: Reusing old results for call to incr
 ---
 > [eva] computing for function incr <- various_loops <- main.
diff --git a/tests/value/oracle_equality/from_termin.res.oracle b/tests/value/oracle_equality/from_termin.res.oracle
index d03d84f92d569928f2f9156ff651c33acd1a291b..1de4a7cee688e081bafe46d39ba6583328a1db51 100644
--- a/tests/value/oracle_equality/from_termin.res.oracle
+++ b/tests/value/oracle_equality/from_termin.res.oracle
@@ -1,2 +1,2 @@
 9a10
-> [eva] from_termin.i:8: starting to merge loop iterations
+> [eva:partition] from_termin.i:8: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/alias.5.res.oracle b/tests/value/oracle_gauges/alias.5.res.oracle
index 59d7dd3d0fc4f5d05f89a26c5554ab4f2dfdc8d4..88f57b327ff0e392f5f00d78723d8176971db4b8 100644
--- a/tests/value/oracle_gauges/alias.5.res.oracle
+++ b/tests/value/oracle_gauges/alias.5.res.oracle
@@ -1,2 +1,2 @@
 59a60
-> [eva] alias.i:260: starting to merge loop iterations
+> [eva:partition] alias.i:260: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/auto_loop_unroll.0.res.oracle b/tests/value/oracle_gauges/auto_loop_unroll.0.res.oracle
index e78e2ecb55c64b572f287090c76d0867ef70e356..4650202d458c7457041faa0905e862927c01f9e5 100644
--- a/tests/value/oracle_gauges/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle_gauges/auto_loop_unroll.0.res.oracle
@@ -16,172 +16,172 @@
 < [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-29,31c23
+30,32c24
 < [eva:alarm] auto_loop_unroll.c:58: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:59: Frama_C_show_each_64: {64}
-33,35c25
+34,36c26
 < [eva:alarm] auto_loop_unroll.c:63: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:64: Frama_C_show_each_40: {40}
-37,39c27
+38,40c28
 < [eva:alarm] auto_loop_unroll.c:69: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:72: Frama_C_show_each_80: {80}
-41,43c29
+42,44c30
 < [eva:alarm] auto_loop_unroll.c:76: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:82: Frama_C_show_each_32_80: [32..83]
-51,53c37
+52,54c38
 < [eva:alarm] auto_loop_unroll.c:88: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:89: Frama_C_show_each_40_50: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:89: Frama_C_show_each_40_50: [40..1073741861]
-128,130c112
+129,131c113
 < [eva:alarm] auto_loop_unroll.c:120: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:122: Frama_C_show_each_32_64: [32..65]
-184,186c166
+185,187c167
 < [eva:alarm] auto_loop_unroll.c:204: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [1..9]
-188,189d167
+189,190d168
 < [eva:alarm] auto_loop_unroll.c:212: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-192c170
+193c171
 < [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [64..2147483647]
-198,200c176
+199,201c177
 < [eva:alarm] auto_loop_unroll.c:224: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:226: Frama_C_show_each_11: {11}
-202,204c178
+203,205c179
 < [eva:alarm] auto_loop_unroll.c:229: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:231: Frama_C_show_each_12: {12}
-206,207d179
+207,208d180
 < [eva:alarm] auto_loop_unroll.c:235: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-209a182,183
+210a183,184
 > [eva:alarm] auto_loop_unroll.c:235: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-212,213d185
+213,214d186
 < [eva:alarm] auto_loop_unroll.c:240: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-215a188,189
+216a189,190
 > [eva:alarm] auto_loop_unroll.c:240: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
-218,219d191
+219,220d192
 < [eva:alarm] auto_loop_unroll.c:248: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-222,224c194
+223,225c195
 < [eva:alarm] auto_loop_unroll.c:253: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:257: Frama_C_show_each_11_111: [11..111]
-226,228c196
+227,229c197
 < [eva:alarm] auto_loop_unroll.c:263: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:265: Frama_C_show_each_16: [16..2147483647]
-236,238c204
+237,239c205
 < [eva:alarm] auto_loop_unroll.c:275: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:277: Frama_C_show_each_20: [20..2147483646]
-240,241d205
+241,242d206
 < [eva:alarm] auto_loop_unroll.c:280: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-244c208,210
+245c209,211
 < [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: [0..2147483647]
 ---
 > [eva:alarm] auto_loop_unroll.c:280: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:282: Frama_C_show_each_21: {21}
-248,249d213
+249,250d214
 < [eva:alarm] auto_loop_unroll.c:284: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
-254,255d217
+255,256d218
 < [eva:alarm] auto_loop_unroll.c:291: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
-260,261d221
+261,262d222
 < [eva:alarm] auto_loop_unroll.c:299: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
-268,270c228,229
+269,271c229,230
 < [eva:alarm] auto_loop_unroll.c:311: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:315: Frama_C_show_each_30: {30}
-> [eva] auto_loop_unroll.c:319: starting to merge loop iterations
-273d231
-< [eva] auto_loop_unroll.c:319: starting to merge loop iterations
-276,278c234
+> [eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
+274d232
+< [eva:partition] auto_loop_unroll.c:319: starting to merge loop iterations
+277,279c235
 < [eva:alarm] auto_loop_unroll.c:328: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:333: Frama_C_show_each_32: {32}
-290,292c246
+291,293c247
 < [eva:alarm] auto_loop_unroll.c:355: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:357: Frama_C_show_each_0_35: [0..35]
-295,296d248
+296,297d249
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:360: Warning: 
-298c250,252
+299c251,253
 < [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: [0..2147483647]
 ---
 > [eva:alarm] auto_loop_unroll.c:360: Warning: 
 >   signed overflow. assert res + 1 ≤ 2147483647;
 > [eva] auto_loop_unroll.c:364: Frama_C_show_each_36: {36}
-307,309c261
+308,310c262
 < [eva:alarm] auto_loop_unroll.c:383: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:387: Frama_C_show_each_50: [1..2147483647]
 ---
 > [eva] auto_loop_unroll.c:387: Frama_C_show_each_50: {50}
-312,313d263
+313,314d264
 < [eva:alarm] auto_loop_unroll.c:392: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-320,323d269
+321,324d270
 < [eva:alarm] auto_loop_unroll.c:404: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:408: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
-325c271
+326c272
 < [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:410: Frama_C_show_each_30: {30}
-327,330d272
+328,331d273
 < [eva:alarm] auto_loop_unroll.c:415: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
 < [eva:alarm] auto_loop_unroll.c:419: Warning: 
 <   signed overflow. assert j + 1 ≤ 2147483647;
-332c274
+333c275
 < [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:424: Frama_C_show_each_30: [15..45]
diff --git a/tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle b/tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle
index ba58b4d3a7f241b07658800d31da63997d010979..a28132999384014d4173c75ac7fc93950dd90f45 100644
--- a/tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle
+++ b/tests/value/oracle_gauges/auto_loop_unroll.1.res.oracle
@@ -1,28 +1,28 @@
-14,16c14
+15,17c15
 < [eva:alarm] auto_loop_unroll.c:31: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:33: Frama_C_show_each_imprecise: {1000}
-18,20c16
+19,21c17
 < [eva:alarm] auto_loop_unroll.c:39: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:41: Frama_C_show_each_imprecise: {100}
-328,330c324
+330,332c326
 < [eva:alarm] auto_loop_unroll.c:204: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
 < [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:206: Frama_C_show_each_imprecise: [1..9]
-332,333d325
+334,335d327
 < [eva:alarm] auto_loop_unroll.c:212: Warning: 
 <   signed overflow. assert res + 1 ≤ 2147483647;
-336c328
+338c330
 < [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [0..2147483647]
 ---
 > [eva] auto_loop_unroll.c:214: Frama_C_show_each_imprecise: [64..2147483647]
-371,372d362
+374,375d365
 < [eva:alarm] auto_loop_unroll.c:299: Warning: 
 <   signed overflow. assert i + 1 ≤ 2147483647;
diff --git a/tests/value/oracle_gauges/bad_loop.res.oracle b/tests/value/oracle_gauges/bad_loop.res.oracle
index ad785fb3df8bdc6eb37261c0afde27318f3294db..d4c3c78aa6e4b9a04419f1c18bb4f0959de5c6eb 100644
--- a/tests/value/oracle_gauges/bad_loop.res.oracle
+++ b/tests/value/oracle_gauges/bad_loop.res.oracle
@@ -1,2 +1,2 @@
 6a7
-> [eva] bad_loop.i:12: starting to merge loop iterations
+> [eva:partition] bad_loop.i:12: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/cast2.res.oracle b/tests/value/oracle_gauges/cast2.res.oracle
index 4ec53f7330a9b664b125c2cf9a4a35a00a0c5d0f..ec440dbddff446006cbcb91a0e91f052bd790cd1 100644
--- a/tests/value/oracle_gauges/cast2.res.oracle
+++ b/tests/value/oracle_gauges/cast2.res.oracle
@@ -1,2 +1,2 @@
 25a26
-> [eva] cast2.i:24: starting to merge loop iterations
+> [eva:partition] cast2.i:24: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/from_termin.res.oracle b/tests/value/oracle_gauges/from_termin.res.oracle
index d03d84f92d569928f2f9156ff651c33acd1a291b..1de4a7cee688e081bafe46d39ba6583328a1db51 100644
--- a/tests/value/oracle_gauges/from_termin.res.oracle
+++ b/tests/value/oracle_gauges/from_termin.res.oracle
@@ -1,2 +1,2 @@
 9a10
-> [eva] from_termin.i:8: starting to merge loop iterations
+> [eva:partition] from_termin.i:8: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/infinite.res.oracle b/tests/value/oracle_gauges/infinite.res.oracle
index 703e902f87dedb626646f339e2717421aaa627da..bb1a293eb736582247bd30db532ef4640418f70a 100644
--- a/tests/value/oracle_gauges/infinite.res.oracle
+++ b/tests/value/oracle_gauges/infinite.res.oracle
@@ -1,5 +1,5 @@
 13a14,23
-> [eva] infinite.i:6: starting to merge loop iterations
+> [eva:partition] infinite.i:6: starting to merge loop iterations
 > [eva] computing for function pause <- main.
 >   Called from infinite.i:9.
 > [eva] Done for function pause
diff --git a/tests/value/oracle_gauges/inout.2.res.oracle b/tests/value/oracle_gauges/inout.2.res.oracle
index f97cf8babc502cf667df97fe2ab6a1781dca447f..cea5b35bae2a0c58df4229dd7dbc5476e490bdb2 100644
--- a/tests/value/oracle_gauges/inout.2.res.oracle
+++ b/tests/value/oracle_gauges/inout.2.res.oracle
@@ -1,2 +1,2 @@
 22a23
-> [eva] inout.i:50: starting to merge loop iterations
+> [eva:partition] inout.i:50: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/inout.3.res.oracle b/tests/value/oracle_gauges/inout.3.res.oracle
index 2da5177ccaf67cc397bd421b0fc63e01f3cc4166..1f3694e80482ec718d3cd2859721466520dfe455 100644
--- a/tests/value/oracle_gauges/inout.3.res.oracle
+++ b/tests/value/oracle_gauges/inout.3.res.oracle
@@ -1,2 +1,2 @@
 22a23
-> [eva] inout.i:60: starting to merge loop iterations
+> [eva:partition] inout.i:60: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/inout.4.res.oracle b/tests/value/oracle_gauges/inout.4.res.oracle
index b5f3d9689ac5c7ea7678e0fd3574b514ca0d25dd..2c21be599a84fa346ff28d643d04994363ff3926 100644
--- a/tests/value/oracle_gauges/inout.4.res.oracle
+++ b/tests/value/oracle_gauges/inout.4.res.oracle
@@ -1,2 +1,2 @@
 24a25
-> [eva] inout.i:60: starting to merge loop iterations
+> [eva:partition] inout.i:60: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/local_slevel.res.oracle b/tests/value/oracle_gauges/local_slevel.res.oracle
index 7dc46e0160ad7640f01c309fe06503d23965be15..d51410f599c6adee65adb557373aad659f37ef40 100644
--- a/tests/value/oracle_gauges/local_slevel.res.oracle
+++ b/tests/value/oracle_gauges/local_slevel.res.oracle
@@ -24,11 +24,11 @@
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [1..79]
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-140c136
+142c138
 <   r ∈ [--..--]
 ---
 >   r ∈ [0..2147483647]
-381,383c377,379
+383,385c379,381
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1}
 < [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0; 1}
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {0; 1; 2}
@@ -36,15 +36,15 @@
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, {0}, {0}
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, {1}, {1}
-385c381
+387c383
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3}
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3}
-387c383
+389c385
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {0; 1; 2; 3; 4}
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, {1; 2; 3; 4}
-389,394c385,386
+391,396c387,388
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [0..2147483647]
 < [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..2147483647]
 < [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [0..2147483648]
@@ -54,7 +54,7 @@
 ---
 > [eva] local_slevel.i:18: Frama_C_show_each: {1}, [1..79],1%2, [1..79]
 > [eva] local_slevel.i:18: Frama_C_show_each: {-1}, [0..78],0%2, [0..78]
-508c500
+512c504
 <   r ∈ [--..--]
 ---
 >   r ∈ [0..2147483647]
diff --git a/tests/value/oracle_gauges/loop_no_var.res.oracle b/tests/value/oracle_gauges/loop_no_var.res.oracle
index ac1b0adeee34460ce72a5ac7153dac5d748313d8..a8723781a6821c1424f94ef2543c61697096257c 100644
--- a/tests/value/oracle_gauges/loop_no_var.res.oracle
+++ b/tests/value/oracle_gauges/loop_no_var.res.oracle
@@ -1,2 +1,2 @@
 6a7
-> [eva] loop_no_var.i:3: starting to merge loop iterations
+> [eva:partition] loop_no_var.i:3: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/loopfun.1.res.oracle b/tests/value/oracle_gauges/loopfun.1.res.oracle
index e88ee84b77801444bdd0403d481a6838639d3962..507aa8af5dfda3916f521bc109f9e0ae6929757b 100644
--- a/tests/value/oracle_gauges/loopfun.1.res.oracle
+++ b/tests/value/oracle_gauges/loopfun.1.res.oracle
@@ -1,8 +1,8 @@
 8a9,11
-> [eva] loopfun.i:23: starting to merge loop iterations
+> [eva:partition] loopfun.i:23: starting to merge loop iterations
 > [eva:loop-unroll:partial] loopfun.i:25: loop not completely unrolled
-> [eva] loopfun.i:25: starting to merge loop iterations
+> [eva:partition] loopfun.i:25: starting to merge loop iterations
 10a14
-> [eva] loopfun.i:26: starting to merge loop iterations
+> [eva:partition] loopfun.i:26: starting to merge loop iterations
 11a16
-> [eva] loopfun.i:27: starting to merge loop iterations
+> [eva:partition] loopfun.i:27: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/memexec.res.oracle b/tests/value/oracle_gauges/memexec.res.oracle
index 58b6132e70dbbefe191c6e4ec31e354d9b41c829..cf9d2ea819b6fa406cf88be9d0967d3756856601 100644
--- a/tests/value/oracle_gauges/memexec.res.oracle
+++ b/tests/value/oracle_gauges/memexec.res.oracle
@@ -1,2 +1,2 @@
 100a101
-> [eva] memexec.c:98: starting to merge loop iterations
+> [eva:partition] memexec.c:98: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/modulo.res.oracle b/tests/value/oracle_gauges/modulo.res.oracle
index 9d8376876db4665030ac04b541ef22fad929ddb4..b26f03be5facf7374e500ea132b0b49f3009ab25 100644
--- a/tests/value/oracle_gauges/modulo.res.oracle
+++ b/tests/value/oracle_gauges/modulo.res.oracle
@@ -172,5 +172,5 @@
 >   Frama_C_show_each_3: {-3; -2; -1; 1; 2; 3}, {-2; -1; 1; 2}, {-1; 0; 1}
 > [eva] modulo.i:64: Frama_C_show_each_3: {-2; -1; 1; 2}, {-1; 1}, {0}
 73a244,245
-> [eva] modulo.i:95: starting to merge loop iterations
-> [eva] modulo.i:82: starting to merge loop iterations
+> [eva:partition] modulo.i:95: starting to merge loop iterations
+> [eva:partition] modulo.i:82: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/noreturn.res.oracle b/tests/value/oracle_gauges/noreturn.res.oracle
index 7851d62f17e233ddfd4cce1e689a538c3c8bee52..14624bc7bb1ca1effa6a559d3321b3a14d3fce8a 100644
--- a/tests/value/oracle_gauges/noreturn.res.oracle
+++ b/tests/value/oracle_gauges/noreturn.res.oracle
@@ -1,8 +1,8 @@
 8a9
-> [eva] noreturn.i:20: starting to merge loop iterations
+> [eva:partition] noreturn.i:20: starting to merge loop iterations
 16a18
-> [eva] noreturn.i:16: starting to merge loop iterations
+> [eva:partition] noreturn.i:16: starting to merge loop iterations
 20a23
-> [eva] noreturn.i:13: starting to merge loop iterations
+> [eva:partition] noreturn.i:13: starting to merge loop iterations
 30a34
-> [eva] noreturn.i:7: starting to merge loop iterations
+> [eva:partition] noreturn.i:7: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/octagons-pointers-intermediate.res.oracle b/tests/value/oracle_gauges/octagons-pointers-intermediate.res.oracle
index 993825158c77e1d611c02be27e37da1414ab72d1..c041b933f16c09c169a1b7bc16ad8ac2cc558f3e 100644
--- a/tests/value/oracle_gauges/octagons-pointers-intermediate.res.oracle
+++ b/tests/value/oracle_gauges/octagons-pointers-intermediate.res.oracle
@@ -1,5 +1,6 @@
-23a24,30
-> [eva] octagons-pointers-intermediate.c:42: starting to merge loop iterations
+24a25,32
+> [eva:partition] octagons-pointers-intermediate.c:42: 
+>   starting to merge loop iterations
 > [eva] octagons-pointers-intermediate.c:45: 
 >   Reusing old results for call to cmdRead
 > [eva] octagons-pointers-intermediate.c:45: 
diff --git a/tests/value/oracle_gauges/octagons-pointers-simple.res.oracle b/tests/value/oracle_gauges/octagons-pointers-simple.res.oracle
index 1f0784eedc6dda45bb7958cdb87c4a3553ffd9b4..1c305433ed084b4835c8f3733df10f15b60033a8 100644
--- a/tests/value/oracle_gauges/octagons-pointers-simple.res.oracle
+++ b/tests/value/oracle_gauges/octagons-pointers-simple.res.oracle
@@ -1,5 +1,5 @@
 39a40,70
-> [eva] octagons-pointers-simple.c:43: starting to merge loop iterations
+> [eva:partition] octagons-pointers-simple.c:43: starting to merge loop iterations
 > [eva] octagons-pointers-simple.c:46: 
 >   Frama_C_dump_each:
 >   # octagon:
diff --git a/tests/value/oracle_gauges/octagons-pointers.res.oracle b/tests/value/oracle_gauges/octagons-pointers.res.oracle
index 2c58a7bd206f37b42c9c11cda6d577546e1498e6..6a3f3dcf6bb3cd778f40577631217fb42a136220 100644
--- a/tests/value/oracle_gauges/octagons-pointers.res.oracle
+++ b/tests/value/oracle_gauges/octagons-pointers.res.oracle
@@ -1,5 +1,5 @@
 83a84,108
-> [eva] octagons-pointers.c:43: starting to merge loop iterations
+> [eva:partition] octagons-pointers.c:43: starting to merge loop iterations
 > [eva] octagons-pointers.c:46: 
 >   Frama_C_dump_each:
 >   # octagon:
diff --git a/tests/value/oracle_gauges/reduce_formals.res.oracle b/tests/value/oracle_gauges/reduce_formals.res.oracle
index 792f46127046db33790b7d51ee48d8bdb770272b..4a0873c51e714737c3462b2c37e5178d46b668af 100644
--- a/tests/value/oracle_gauges/reduce_formals.res.oracle
+++ b/tests/value/oracle_gauges/reduce_formals.res.oracle
@@ -1,2 +1,2 @@
 9a10
-> [eva] reduce_formals.i:5: starting to merge loop iterations
+> [eva:partition] reduce_formals.i:5: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/redundant_alarms.res.oracle b/tests/value/oracle_gauges/redundant_alarms.res.oracle
index 913f8ab9f773d1c9ba23e01b0551932c560dbeaa..7e5b750f485311cafc8a9d316d62e3ee12e3d1d2 100644
--- a/tests/value/oracle_gauges/redundant_alarms.res.oracle
+++ b/tests/value/oracle_gauges/redundant_alarms.res.oracle
@@ -1,2 +1,2 @@
 46a47
-> [eva] redundant_alarms.c:39: starting to merge loop iterations
+> [eva:partition] redundant_alarms.c:39: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/symbolic_locs.res.oracle b/tests/value/oracle_gauges/symbolic_locs.res.oracle
index 21b68fc6866bcb406c6cacf1ca29b3acfbe3c527..92cd15bf03df6cda789fa4477505fa674109e7ee 100644
--- a/tests/value/oracle_gauges/symbolic_locs.res.oracle
+++ b/tests/value/oracle_gauges/symbolic_locs.res.oracle
@@ -1,2 +1,2 @@
 179a180
-> [eva] symbolic_locs.i:93: starting to merge loop iterations
+> [eva:partition] symbolic_locs.i:93: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/taint.res.oracle b/tests/value/oracle_gauges/taint.res.oracle
index 9f5e0363bf27603ae97594e9c9fa396112c0754a..7f23b681cf1098959a1dc25b739be075551c5bec 100644
--- a/tests/value/oracle_gauges/taint.res.oracle
+++ b/tests/value/oracle_gauges/taint.res.oracle
@@ -1,2 +1,2 @@
 171a172
-> [eva] taint.c:147: starting to merge loop iterations
+> [eva:partition] taint.c:147: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/undefined_sequence.0.res.oracle b/tests/value/oracle_gauges/undefined_sequence.0.res.oracle
index 46a1b756d0ee836b510f8f4148a2ea3e5d30c89b..0ee1abcac750324fabbfd7553e8c9aa336fdd489 100644
--- a/tests/value/oracle_gauges/undefined_sequence.0.res.oracle
+++ b/tests/value/oracle_gauges/undefined_sequence.0.res.oracle
@@ -1,4 +1,4 @@
 97a98
-> [eva] undefined_sequence.i:43: starting to merge loop iterations
+> [eva:partition] undefined_sequence.i:43: starting to merge loop iterations
 101a103
-> [eva] undefined_sequence.i:49: starting to merge loop iterations
+> [eva:partition] undefined_sequence.i:49: starting to merge loop iterations
diff --git a/tests/value/oracle_gauges/unroll.res.oracle b/tests/value/oracle_gauges/unroll.res.oracle
index 08cf552adc2f6b8e2dc24e148fd15aeb93959fa3..0d7ed0fa4e2e8b63e11955f028a90017aee3e27c 100644
--- a/tests/value/oracle_gauges/unroll.res.oracle
+++ b/tests/value/oracle_gauges/unroll.res.oracle
@@ -1,7 +1,7 @@
 13d12
 < [eva:alarm] unroll.i:34: Warning: signed overflow. assert -2147483648 ≤ j - 1;
 14a14
-> [eva] unroll.i:39: starting to merge loop iterations
+> [eva:partition] unroll.i:39: starting to merge loop iterations
 24c24
 <   j ∈ [-2147483648..-123]
 ---
diff --git a/tests/value/oracle_gauges/unroll_simple.res.oracle b/tests/value/oracle_gauges/unroll_simple.res.oracle
index b61eb32c15e7107b06a1fc39a785a26edeee5eb3..7ddf9dd5efed686cc3c5ffe5b4175dcac334acf5 100644
--- a/tests/value/oracle_gauges/unroll_simple.res.oracle
+++ b/tests/value/oracle_gauges/unroll_simple.res.oracle
@@ -2,7 +2,7 @@
 < [eva:alarm] unroll_simple.i:11: Warning: 
 <   signed overflow. assert -2147483648 ≤ j - 1;
 11a10
-> [eva] unroll_simple.i:16: starting to merge loop iterations
+> [eva:partition] unroll_simple.i:16: starting to merge loop iterations
 21c20
 <   j ∈ [-2147483648..-126]
 ---
diff --git a/tests/value/oracle_gauges/widen_on_non_monotonic.res.oracle b/tests/value/oracle_gauges/widen_on_non_monotonic.res.oracle
index 2310b4cf818cd2997af37b5894c64e964b1a72fb..15640f703e343daa993fd39d230ca639be2a0add 100644
--- a/tests/value/oracle_gauges/widen_on_non_monotonic.res.oracle
+++ b/tests/value/oracle_gauges/widen_on_non_monotonic.res.oracle
@@ -1,3 +1,3 @@
 25a26,27
-> [eva] widen_on_non_monotonic.i:21: starting to merge loop iterations
-> [eva] widen_on_non_monotonic.i:18: starting to merge loop iterations
+> [eva:partition] widen_on_non_monotonic.i:21: starting to merge loop iterations
+> [eva:partition] widen_on_non_monotonic.i:18: starting to merge loop iterations
diff --git a/tests/value/oracle_multidim/alias.5.res.oracle b/tests/value/oracle_multidim/alias.5.res.oracle
index 59d7dd3d0fc4f5d05f89a26c5554ab4f2dfdc8d4..88f57b327ff0e392f5f00d78723d8176971db4b8 100644
--- a/tests/value/oracle_multidim/alias.5.res.oracle
+++ b/tests/value/oracle_multidim/alias.5.res.oracle
@@ -1,2 +1,2 @@
 59a60
-> [eva] alias.i:260: starting to merge loop iterations
+> [eva:partition] alias.i:260: starting to merge loop iterations
diff --git a/tests/value/oracle_octagon/alias.5.res.oracle b/tests/value/oracle_octagon/alias.5.res.oracle
index 59d7dd3d0fc4f5d05f89a26c5554ab4f2dfdc8d4..88f57b327ff0e392f5f00d78723d8176971db4b8 100644
--- a/tests/value/oracle_octagon/alias.5.res.oracle
+++ b/tests/value/oracle_octagon/alias.5.res.oracle
@@ -1,2 +1,2 @@
 59a60
-> [eva] alias.i:260: starting to merge loop iterations
+> [eva:partition] alias.i:260: starting to merge loop iterations
diff --git a/tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle b/tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle
index e6769c39a091fb0db67eaa16bf28827f70f8cfc6..8aac50f0709ace6a4eb421d8798eb5a21d94a97b 100644
--- a/tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle
+++ b/tests/value/oracle_octagon/auto_loop_unroll.0.res.oracle
@@ -1,23 +1,23 @@
-208,209d207
+209,210d208
 < [eva:alarm] auto_loop_unroll.c:234: Warning: 
 <   signed overflow. assert -2147483648 ≤ i_0 - 1;
-214,215d211
+215,216d212
 < [eva:alarm] auto_loop_unroll.c:239: Warning: 
 <   signed overflow. assert -2147483648 ≤ i_1 - 1;
-242,243d237
+243,244d238
 < [eva:alarm] auto_loop_unroll.c:279: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-296,297d289
+297,298d290
 < [eva:alarm] auto_loop_unroll.c:360: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-312,313d303
+313,314d304
 < [eva:alarm] auto_loop_unroll.c:392: Warning: 
 <   signed overflow. assert -2147483648 ≤ i - 1;
-365c355
+366c356
 <   i ∈ [-2147483648..50]
 ---
 >   i ∈ [-1..50]
-370,372c360,362
+371,373c361,363
 <   i ∈ [0..2147483647]
 <   j ∈ [23..2147483647]
 <   k ∈ [22..2147483647]
diff --git a/tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle b/tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle
index f161cc5e9e2f4aec7aefaa7c67180de975727212..0044c4a10bea6d8520116609bc5ef49dd0616a13 100644
--- a/tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle
+++ b/tests/value/oracle_octagon/auto_loop_unroll.1.res.oracle
@@ -1,4 +1,4 @@
-459,460c459,460
+463,464c463,464
 <   i ∈ [0..2147483647]
 <   j ∈ [23..2147483647]
 ---
diff --git a/tests/value/oracle_octagon/from_termin.res.oracle b/tests/value/oracle_octagon/from_termin.res.oracle
index d03d84f92d569928f2f9156ff651c33acd1a291b..1de4a7cee688e081bafe46d39ba6583328a1db51 100644
--- a/tests/value/oracle_octagon/from_termin.res.oracle
+++ b/tests/value/oracle_octagon/from_termin.res.oracle
@@ -1,2 +1,2 @@
 9a10
-> [eva] from_termin.i:8: starting to merge loop iterations
+> [eva:partition] from_termin.i:8: starting to merge loop iterations
diff --git a/tests/value/oracle_octagon/redundant_alarms.res.oracle b/tests/value/oracle_octagon/redundant_alarms.res.oracle
index 913f8ab9f773d1c9ba23e01b0551932c560dbeaa..7e5b750f485311cafc8a9d316d62e3ee12e3d1d2 100644
--- a/tests/value/oracle_octagon/redundant_alarms.res.oracle
+++ b/tests/value/oracle_octagon/redundant_alarms.res.oracle
@@ -1,2 +1,2 @@
 46a47
-> [eva] redundant_alarms.c:39: starting to merge loop iterations
+> [eva:partition] redundant_alarms.c:39: starting to merge loop iterations
diff --git a/tests/value/oracle_octagon/unroll.res.oracle b/tests/value/oracle_octagon/unroll.res.oracle
index b0b04dfe12a225825d9f1736faa4efc66d5f5b03..fcbfa5a8e76b3dc06c972d15305331bbee327ecf 100644
--- a/tests/value/oracle_octagon/unroll.res.oracle
+++ b/tests/value/oracle_octagon/unroll.res.oracle
@@ -1,5 +1,5 @@
 14a15
-> [eva] unroll.i:39: starting to merge loop iterations
+> [eva:partition] unroll.i:39: starting to merge loop iterations
 20c21
 <   G ∈ [17739..2147483647]
 ---
diff --git a/tests/value/oracle_octagon/unroll_simple.res.oracle b/tests/value/oracle_octagon/unroll_simple.res.oracle
index 0aead1b2497a8c7979e9bfe3c5945cdb38fb4408..a92ed225b7ff6dc4548f828859f914c56c73abed 100644
--- a/tests/value/oracle_octagon/unroll_simple.res.oracle
+++ b/tests/value/oracle_octagon/unroll_simple.res.oracle
@@ -1,5 +1,5 @@
 11a12
-> [eva] unroll_simple.i:16: starting to merge loop iterations
+> [eva:partition] unroll_simple.i:16: starting to merge loop iterations
 17c18
 <   G ∈ [8772..2147483647]
 ---
diff --git a/tests/value/traces/oracle/test4.res.oracle b/tests/value/traces/oracle/test4.res.oracle
index 8a9b74fa1e3c2a5f91c8097a7daa3a5a8f7ffa7e..46acec6e327ec58a0bebef8afe586d5ecda838da 100644
--- a/tests/value/traces/oracle/test4.res.oracle
+++ b/tests/value/traces/oracle/test4.res.oracle
@@ -5,7 +5,7 @@
 [eva] Initial state computed
 [eva:initial-state] Values of globals at initialization
   
-[eva] test4.i:9: starting to merge loop iterations
+[eva:partition] test4.i:9: starting to merge loop iterations
 [eva:alarm] test4.i:11: Warning: signed overflow. assert tmp + 1 ≤ 2147483647;
 [eva:alarm] test4.i:14: Warning: signed overflow. assert tmp + 1 ≤ 2147483647;
 [eva:alarm] test4.i:17: Warning: signed overflow. assert tmp + 1 ≤ 2147483647;
diff --git a/tests/value/traces/oracle/test5.res.oracle b/tests/value/traces/oracle/test5.res.oracle
index 24b44691ad324e81e3179c2efa429290635572c1..e4b10bdd97bcd583e218df5b1d65874a5df671ee 100644
--- a/tests/value/traces/oracle/test5.res.oracle
+++ b/tests/value/traces/oracle/test5.res.oracle
@@ -49,7 +49,7 @@
 [eva] computing for function my_switch <- main.
   Called from test5.i:21.
 [eva] Done for function my_switch
-[eva] test5.i:20: starting to merge loop iterations
+[eva:partition] test5.i:20: starting to merge loop iterations
 [eva] computing for function my_switch <- main.
   Called from test5.i:21.
 [eva] Done for function my_switch
@@ -89,7 +89,7 @@
 [eva] computing for function my_switch <- main.
   Called from test5.i:21.
 [eva] Done for function my_switch
-[eva] test5.i:19: starting to merge loop iterations
+[eva:partition] test5.i:19: starting to merge loop iterations
 [eva] computing for function my_switch <- main.
   Called from test5.i:21.
 [eva] Done for function my_switch