2 files changed, 6 insertions, 7 deletions
diff --git a/lib/if.c b/lib/if.c
index d4b3d3f7a4..dc417f8e3c 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -678,7 +678,7 @@ if_sunwzebra_get (const char *name, size_t nlen, vrf_id_t vrf_id)
 
 DEFUN (interface,
        interface_cmd,
-       "interface IFNAME [vrf VRFNAME]",
+       "interface IFNAME [vrf NAME]",
        "Select an interface to configure\n"
        "Interface's name\n"
        VRF_CMD_HELP_STR)
@@ -723,7 +723,7 @@ DEFUN (interface,
 
 DEFUN_NOSH (no_interface,
            no_interface_cmd,
-           "no interface IFNAME [vrf VRFNAME]",
+           "no interface IFNAME [vrf NAME]",
            NO_STR
            "Delete a pseudo interface's configuration\n"
            "Interface's name\n"
@@ -774,7 +774,7 @@ if_cmd_init (void)
 /* For debug purpose. */
 DEFUN (show_address,
        show_address_cmd,
-       "show address [vrf VRFNAME]",
+       "show address [vrf NAME]",
        SHOW_STR
        "address\n"
        VRF_CMD_HELP_STR)
diff --git a/lib/vrf.c b/lib/vrf.c
index dbba67164f..5199795fdf 100644
--- a/lib/vrf.c
+++ b/lib/vrf.c
@@ -391,7 +391,7 @@ vrf_autocomplete (vector comps, struct cmd_token *token)
 
 static const struct cmd_variable_handler vrf_var_handlers[] = {
   {
-    .tokenname = "VRFNAME",
+    .varname = "vrf",
     .completions = vrf_autocomplete,
   },
   {
@@ -399,7 +399,6 @@ static const struct cmd_variable_handler vrf_var_handlers[] = {
   },
 };
 
-
 /* Initialize VRF module. */
 void
 vrf_init (int (*create)(struct vrf *),
@@ -464,7 +463,7 @@ vrf_socket (int domain, int type, int protocol, vrf_id_t vrf_id)
 /* vrf CLI commands */
 DEFUN_NOSH (vrf,
        vrf_cmd,
-       "vrf VRFNAME",
+       "vrf NAME",
        "Select a VRF to configure\n"
        "VRF's name\n")
 {
@@ -489,7 +488,7 @@ DEFUN_NOSH (vrf,
 
 DEFUN_NOSH (no_vrf,
            no_vrf_cmd,
-           "no vrf VRFNAME",
+           "no vrf NAME",
            NO_STR
            "Delete a pseudo VRF's configuration\n"
            "VRF's name\n")