diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 080c4e2dc7..99db69b7c5 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -7708,6 +7708,9 @@ static const struct cmd_variable_handler bgp_viewvrf_var_handlers[] = {
     .tokenname = "VIEWVRFNAME",
     .completions = bgp_viewvrf_autocomplete
   },
+  {
+    .completions = NULL
+  },
 };
 
 void
diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index 71443ebec5..7c5d6ce3fa 100644
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -5177,7 +5177,7 @@ vnc_add_vrf_prefix (struct vty *vty,
 
 DEFUN (add_vrf_prefix_rd_label_pref,
        add_vrf_prefix_rd_label_pref_cmd,
-      "add vrf VRFNAME prefix <A.B.C.D/M|X:X::X:X/M> [{rd ASN:nn_or_IP-address|label (0-1048575)|preference (0-4294967295)}]",
+      "add vrf NAME prefix <A.B.C.D/M|X:X::X:X/M> [{rd ASN:nn_or_IP-address|label (0-1048575)|preference (0-4294967295)}]",
        "Add\n"
        "To a VRF\n"
        "VRF name\n"
@@ -5312,7 +5312,7 @@ vnc_clear_vrf (struct vty *vty,
 
 DEFUN (clear_vrf_prefix_rd,
        clear_vrf_prefix_rd_cmd,
-       "clear vrf VRFNAME [prefix <A.B.C.D/M|X:X::X:X/M>] [rd ASN:nn_or_IP-address]",
+       "clear vrf NAME [prefix <A.B.C.D/M|X:X::X:X/M>] [rd ASN:nn_or_IP-address]",
        "Clear stored data\n"
        "From a VRF\n"
        "VRF name\n"
@@ -5347,7 +5347,7 @@ DEFUN (clear_vrf_prefix_rd,
 
 DEFUN (clear_vrf_all,
        clear_vrf_all_cmd,
-       "clear vrf VRFNAME all",
+       "clear vrf NAME all",
        "Clear stored data\n"
        "From a VRF\n"
        "VRF name\n"