diff --git a/epan/dissectors/packet-tacacs.c b/epan/dissectors/packet-tacacs.c
index c8924d75fc..847148a90a 100644
--- a/epan/dissectors/packet-tacacs.c
+++ b/epan/dissectors/packet-tacacs.c
@@ -249,55 +249,55 @@ proto_register_tacacs(void)
 	  { &hf_tacacs_version,
 	    { "Version",           "tacacs.version",
 	      FT_UINT8, BASE_HEX, VALS(tacacs_version_vals), 0x0,
-	      "Version", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_type,
 	    { "Type",              "tacacs.type",
 	      FT_UINT8, BASE_DEC, VALS(tacacs_type_vals), 0x0,
-	      "Type", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_nonce,
 	    { "Nonce",             "tacacs.nonce",
 	      FT_UINT16, BASE_HEX, NULL, 0x0,
-	      "Nonce", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_userlen,
 	    { "Username length",   "tacacs.userlen",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "Username length", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_passlen,
 	    { "Password length",   "tacacs.passlen",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "Password length", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_response,
 	    { "Response",          "tacacs.response",
 	      FT_UINT8, BASE_DEC, VALS(tacacs_resp_vals), 0x0,
-	      "Response", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_reason,
 	    { "Reason",            "tacacs.reason",
 	      FT_UINT8, BASE_DEC, VALS(tacacs_reason_vals), 0x0,
-	      "Reason", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_result1,
 	    { "Result 1",          "tacacs.result1",
 	      FT_UINT32, BASE_HEX, NULL, 0x0,
-	      "Result 1", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_destaddr,
 	    { "Destination address", "tacacs.destaddr",
 	      FT_IPv4, BASE_NONE, NULL, 0x0,
-	      "Destination address", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_destport,
 	    { "Destination port",  "tacacs.destport",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "Destination port", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_line,
 	    { "Line",              "tacacs.line",
 	      FT_UINT16, BASE_DEC, NULL, 0x0,
-	      "Line", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_result2,
 	    { "Result 2",          "tacacs.result2",
 	      FT_UINT32, BASE_HEX, NULL, 0x0,
-	      "Result 2", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacacs_result3,
 	    { "Result 3",          "tacacs.result3",
 	      FT_UINT16, BASE_HEX, NULL, 0x0,
-	      "Result 3", HFILL }},
+	      NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
@@ -1061,15 +1061,15 @@ proto_register_tacplus(void)
 	  { &hf_tacplus_type,
 	    { "Type",               "tacplus.type",
 	      FT_UINT8, BASE_DEC, VALS(tacplus_type_vals), 0x0,
-	      "Type", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacplus_seqno,
 	    { "Sequence number",    "tacplus.seqno",
 	      FT_UINT8, BASE_DEC, NULL, 0x0,
-	      "Sequence number", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacplus_flags,
 	    { "Flags",              "tacplus.flags",
 	      FT_UINT8, BASE_HEX, NULL, 0x0,
-	      "Flags", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacplus_flags_payload_type,
 	    { "Unencrypted",       "tacplus.flags.unencrypted",
 	      FT_BOOLEAN, 8, TFS(&flags_set_truth), FLAGS_UNENCRYPTED,
@@ -1081,15 +1081,15 @@ proto_register_tacplus(void)
 	  { &hf_tacplus_acct_flags,
 	    { "Flags",    "tacplus.acct.flags",
 	      FT_UINT8, BASE_HEX, NULL, 0x0,
-	      "Flags", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacplus_session_id,
 	    { "Session ID",         "tacplus.session_id",
 	      FT_UINT32, BASE_DEC, NULL, 0x0,
-	      "Session ID", HFILL }},
+	      NULL, HFILL }},
 	  { &hf_tacplus_packet_len,
 	    { "Packet length",      "tacplus.packet_len",
 	      FT_UINT32, BASE_DEC, NULL, 0x0,
-	      "Packet length", HFILL }}
+	      NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_tacplus,