diff --git a/src/plugins/fset/fset-buffer.c b/src/plugins/fset/fset-buffer.c
index 4d07ef278..6161fa2a2 100644
--- a/src/plugins/fset/fset-buffer.c
+++ b/src/plugins/fset/fset-buffer.c
@@ -167,7 +167,7 @@ fset_buffer_display_line (int y, struct t_fset_option *fset_option)
     weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
                            "value", str_field);
 
-    /* value_with_parent */
+    /* value2 (value with parent value in case of inherited value) */
     ptr_parent_value = weechat_hdata_string (fset_hdata_fset_option,
                                              fset_option, "parent_value");
     if (value_undef && ptr_parent_value)
@@ -188,10 +188,9 @@ fset_buffer_display_line (int y, struct t_fset_option *fset_option)
                   (ptr_parent_value) ? ptr_parent_value : FSET_OPTION_VALUE_NULL,
                   (add_quotes_parent) ? weechat_color (weechat_config_string (fset_config_color_quotes[selected_line])) : "",
                   (add_quotes_parent) ? "\"" : "");
-        fset_buffer_fills_field (str_field, sizeof (str_field),
-                                 "value_with_parent", 32);
+        fset_buffer_fills_field (str_field, sizeof (str_field), "value2", 32);
         weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
-                               "value_with_parent", str_field);
+                               "value2", str_field);
     }
     else
     {
@@ -203,10 +202,9 @@ fset_buffer_display_line (int y, struct t_fset_option *fset_option)
               (ptr_field) ? ptr_field : FSET_OPTION_VALUE_NULL,
               (add_quotes) ? weechat_color (weechat_config_string (fset_config_color_quotes[selected_line])) : "",
               (add_quotes) ? "\"" : "");
-        fset_buffer_fills_field (str_field, sizeof (str_field),
-                                 "value_with_parent", 32);
+        fset_buffer_fills_field (str_field, sizeof (str_field), "value2", 32);
         weechat_hashtable_set (fset_buffer_hashtable_extra_vars,
-                               "value_with_parent", str_field);
+                               "value2", str_field);
     }
 
     /* set other variables depending on the value */
diff --git a/src/plugins/fset/fset-config.c b/src/plugins/fset/fset-config.c
index b84ee56b7..dcd77fa77 100644
--- a/src/plugins/fset/fset-config.c
+++ b/src/plugins/fset/fset-config.c
@@ -181,7 +181,7 @@ fset_config_init ()
         N_("format of each line with an option "
            "(note: content is evaluated, see /help fset)"),
         NULL, 0, 0,
-        " ${name} ${type} ${value_with_parent}",
+        " ${name} ${type} ${value2}",
         NULL, 0,
         NULL, NULL, NULL,
         &fset_config_change_format, NULL, NULL,
diff --git a/src/plugins/fset/fset-option.c b/src/plugins/fset/fset-option.c
index d48dbace3..636e721e6 100644
--- a/src/plugins/fset/fset-option.c
+++ b/src/plugins/fset/fset-option.c
@@ -346,11 +346,11 @@ fset_option_set_max_length_fields_option (struct t_fset_option *fset_option)
     }
     fset_option_set_max_length_field ("parent_value", length_parent_value);
 
-    /* value_with_parent */
+    /* value2 */
     length = length_value;
     if (!fset_option->value)
         length += 4 + length_parent_value;
-    fset_option_set_max_length_field ("value_with_parent", length);
+    fset_option_set_max_length_field ("value2", length);
 }
 
 /*