diff --git a/src/plugins/dive/self.ml b/src/plugins/dive/self.ml
index 4d5fc538ba3f5c49b664282c68c0fd713b71f0aa..75bc7d1cce238aad412ea6d2bb83842f8b65b297 100644
--- a/src/plugins/dive/self.ml
+++ b/src/plugins/dive/self.ml
@@ -53,7 +53,7 @@ module DepthLimit = Int
 
 module FromFunctionAlarms = Kernel_function_set
     (struct
-      let option_name = "-dive-from-function-alarms"
+      let option_name = "-dive-from-alarms"
       let help = "Build the graph from the alarms emitted in the given functions."
       let arg_name = "f1,..."
     end)
@@ -109,7 +109,7 @@ module Varinfo_set (X: Parameter_sig.Input_with_arg) =
 
 module FromBases = Varinfo_set
     (struct
-      let option_name = "-dive-from"
+      let option_name = "-dive-from-variables"
       let help = "Build the graph from these local variables."
       let arg_name = "f::v,..."
     end)
diff --git a/src/plugins/dive/tests/dive/assigned_param.i b/src/plugins/dive/tests/dive/assigned_param.i
index a5d5fd969b460290476e06681fab085f00f35fbc..fb2876d7010ba35b4a66b5c510f4c5b70cf9143f 100644
--- a/src/plugins/dive/tests/dive/assigned_param.i
+++ b/src/plugins/dive/tests/dive/assigned_param.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::w -dive-depth-limit 5"
+STDOPT: +"-dive-from-variables main::w -dive-depth-limit 5"
 */
 
 volatile int nondet;
diff --git a/src/plugins/dive/tests/dive/callstack_strategy.i b/src/plugins/dive/tests/dive/callstack_strategy.i
index 72d1f5a832cdd8eb14cfe6742d48c89e4c0df9e5..b309e51cfc28261a73aedd2f06e2bf8c06668486 100644
--- a/src/plugins/dive/tests/dive/callstack_strategy.i
+++ b/src/plugins/dive/tests/dive/callstack_strategy.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from g::r -dive-depth-limit 20"
+STDOPT: +"-dive-from-variables g::r -dive-depth-limit 20"
 */
 
 float f(float z) {
diff --git a/src/plugins/dive/tests/dive/const.i b/src/plugins/dive/tests/dive/const.i
index 84c62df4f10aca105a8c3a832db0df6742880629..7001746bea33cc57f5d2f0d0a678118be3606e08 100644
--- a/src/plugins/dive/tests/dive/const.i
+++ b/src/plugins/dive/tests/dive/const.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::res -dive-depth-limit 4"
+STDOPT: +"-dive-from-variables main::res -dive-depth-limit 4"
 */
 
 int f(int x, int y)
@@ -13,4 +13,4 @@ int main(int i)
 {
   int res = f(i, 2*i);
   return res;
-}
\ No newline at end of file
+}
diff --git a/src/plugins/dive/tests/dive/global.i b/src/plugins/dive/tests/dive/global.i
index d475e3862e4bc171284629d6eed890587c80f8bf..ca08f89790d56aef256c8a8d67fe553d065bbb5d 100644
--- a/src/plugins/dive/tests/dive/global.i
+++ b/src/plugins/dive/tests/dive/global.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::z"
+STDOPT: +"-dive-from-variables main::z"
 */
 
 float g;
diff --git a/src/plugins/dive/tests/dive/per_callstack.i b/src/plugins/dive/tests/dive/per_callstack.i
index a264d1a6844b89ab1c14fe415ef4abb2a41f1342..5a5d81b22cc9469962a5696f6816f540a7ece1b6 100644
--- a/src/plugins/dive/tests/dive/per_callstack.i
+++ b/src/plugins/dive/tests/dive/per_callstack.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::w -dive-depth-limit 20"
+STDOPT: +"-dive-from-variables main::w -dive-depth-limit 20"
 */
 
 float f(float x) {
diff --git a/src/plugins/dive/tests/dive/pointed_param.i b/src/plugins/dive/tests/dive/pointed_param.i
index 3a47e7648f45c791bbac77ad0a3eced3701e9619..e6bd4f47db024a2e99baa09be7a14905108f0fe2 100644
--- a/src/plugins/dive/tests/dive/pointed_param.i
+++ b/src/plugins/dive/tests/dive/pointed_param.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::y -dive-depth-limit 5"
+STDOPT: +"-dive-from-variables main::y -dive-depth-limit 5"
 */
 
 float h(float *p)
diff --git a/src/plugins/dive/tests/dive/pointers_to_local.i b/src/plugins/dive/tests/dive/pointers_to_local.i
index 832b282261ad396f1a0282f923148c59a12c0bf3..a1f5c7af079921b0e106469c4d1cf09a4c4d0725 100644
--- a/src/plugins/dive/tests/dive/pointers_to_local.i
+++ b/src/plugins/dive/tests/dive/pointers_to_local.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::x -dive-depth-limit 5"
+STDOPT: +"-dive-from-variables main::x -dive-depth-limit 5"
 */
 
 void g(float *p) {
diff --git a/src/plugins/dive/tests/dive/unfocused_callers.i b/src/plugins/dive/tests/dive/unfocused_callers.i
index f61e84387379f993b87f8f8e61cb3111225369fe..44723b2c92f6c930b240cf92c2e8c9e7225c7c75 100644
--- a/src/plugins/dive/tests/dive/unfocused_callers.i
+++ b/src/plugins/dive/tests/dive/unfocused_callers.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from g::x -dive-depth-limit 7"
+STDOPT: +"-dive-from-variables g::x -dive-depth-limit 7"
 */
 
 float g(float x) {
diff --git a/src/plugins/dive/tests/dive/various.i b/src/plugins/dive/tests/dive/various.i
index f4008ace228beb45bfbd76fcabfacbbad1e72edd..62468d375e7ffa0f73f17935d09e60d152884a81 100644
--- a/src/plugins/dive/tests/dive/various.i
+++ b/src/plugins/dive/tests/dive/various.i
@@ -1,5 +1,5 @@
 /* run.config
-STDOPT: +"-dive-from main::z,f::x2 -dive-from-function-alarms f,main -dive-depth-limit 5"
+STDOPT: +"-dive-from-variables main::z,f::x2 -dive-from-alarms f,main -dive-depth-limit 5"
 */
 
 float g;