diff --git a/src/plugins/value/partitioning/partition.ml b/src/plugins/value/partitioning/partition.ml
index 91f40d87ad344b39aeb2f01e5f018d125c7ee590..11b21896305d75795e6db9a5394ae8d2fc7b0279 100644
--- a/src/plugins/value/partitioning/partition.ml
+++ b/src/plugins/value/partitioning/partition.ml
@@ -160,10 +160,10 @@ type key = {
 }
 
 type call_return_policy = {
-  policy_keep_callee_splits: bool;
-  policy_keep_callee_history: bool;
-  policy_keep_caller_history: bool;
-  policy_history_size: int;
+  callee_splits: bool;
+  callee_history: bool;
+  caller_history: bool;
+  history_size: int;
 }
 
 module Key =
@@ -255,17 +255,17 @@ struct
     in {
       ration_stamp = None;
       branches =
-        Extlib.list_first_n policy.policy_history_size (
-          (if policy.policy_keep_callee_history then callee.branches else []) @
-          (if policy.policy_keep_caller_history then caller.branches else [])
+        Extlib.list_first_n policy.history_size (
+          (if policy.callee_history then callee.branches else []) @
+          (if policy.caller_history then caller.branches else [])
         );
       loops = caller.loops;
       splits =
-        if policy.policy_keep_callee_splits
+        if policy.callee_splits
         then SplitMap.merge keep_second caller.splits callee.splits
         else caller.splits;
       dynamic_splits =
-        if policy.policy_keep_callee_splits
+        if policy.callee_splits
         then SplitMap.merge keep_second caller.dynamic_splits callee.dynamic_splits
         else caller.dynamic_splits;
     }
diff --git a/src/plugins/value/partitioning/partition.mli b/src/plugins/value/partitioning/partition.mli
index 8ac9926955e9ec140a9a45f8fe98ac5e20d6c134..73f51aca0cdea79c8c5bd82ca795338862b97ca5 100644
--- a/src/plugins/value/partitioning/partition.mli
+++ b/src/plugins/value/partitioning/partition.mli
@@ -42,10 +42,10 @@
 type key
 
 type call_return_policy = {
-  policy_keep_callee_splits: bool;
-  policy_keep_callee_history: bool;
-  policy_keep_caller_history: bool;
-  policy_history_size: int;
+  callee_splits: bool;
+  callee_history: bool;
+  caller_history: bool;
+  history_size: int;
 }
 
 module Key : sig
diff --git a/src/plugins/value/partitioning/partitioning_parameters.ml b/src/plugins/value/partitioning/partitioning_parameters.ml
index 60f8b52616c673f009f0a9bd971e059944ef38cf..2c6b4ccb8eb2b6acc5ce9a9b4f291f3923c3c0e2 100644
--- a/src/plugins/value/partitioning/partitioning_parameters.ml
+++ b/src/plugins/value/partitioning/partitioning_parameters.ml
@@ -141,11 +141,11 @@ struct
     List.fold_left map_annot [] (get_flow_annot stmt)
 
   let call_return_policy = {
-    Partition.policy_keep_callee_splits =
+    Partition.callee_splits =
       Value_parameters.InterproceduralPartitioningKeepSplits.get ();
-    policy_keep_callee_history =
+    callee_history =
       Value_parameters.InterproceduralPartitioningKeepHistory.get ();
-    policy_keep_caller_history = true;
-    policy_history_size = history_size;
+    caller_history = true;
+    history_size = history_size;
   }
 end