Fix some hf_ field datatype conflicts.

'ieee17221.clock_source_id' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64
'ieee17221.stream_format' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64
'afp.unknown' exists multiple times with NOT compatible types: FT_UINT16 and FT_BYTES
'afp.toc_offset' exists multiple times with NOT compatible types: FT_NONE and FT_UINT64
'bootp.client_id.iaid' exists multiple times with NOT compatible types: FT_UINT32 and FT_STRING
'bthfp.chld.mode' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8
'canopen.pdo.data' exists multiple times with NOT compatible types: FT_STRINGZ and FT_BYTES
'canopen.sdo.data' exists multiple times with NOT compatible types: FT_UINT32 and FT_BYTES
'ceph.msg.' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'ceph.version' exists multiple times with NOT compatible types: FT_UINT16 and FT_UINT64
'cip.linkaddress' exists multiple times with NOT compatible types: FT_STRING and FT_UINT8
'dnp3.al.ana' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32
'dnp3.al.anaout' exists multiple times with NOT compatible types: FT_FLOAT and FT_INT32
'dtls.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16
'ssl.handshake.cert_url.url_hash_len' exists multiple times with NOT compatible types: FT_STRING and FT_UINT16
'dvb-s2_gse.label' exists multiple times with NOT compatible types: FT_UINT24 and FT_ETHER
'fcdns.rply.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8
'fcdns.req.fc4type' exists multiple times with NOT compatible types: FT_NONE and FT_UINT8
'icmp.int_info.name' exists multiple times with NOT compatible types: FT_STRING and FT_BOOLEAN
'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT8
'icmpv6.ilnp.nb_locs' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'mausb.clear_transfers.status' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE
'mikey.v' exists multiple times with NOT compatible types: FT_BOOLEAN and FT_NONE
'mswsp.rangeboundry.ultype' exists multiple times with NOT compatible types: FT_STRING and FT_UINT32
'mswsp.arrayvector.address64' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'nlm.lock.l_offset' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'nlm.lock.l_len' exists multiple times with NOT compatible types: FT_UINT32 and FT_UINT64
'pflog.saddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pflog.daddr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pflog.saddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6
'pflog.daddr' exists multiple times with NOT compatible types: FT_BYTES and FT_IPv6
'pgm.spm.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.nak.src' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.nak.grp' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.poll.path' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv4 and FT_IPv6
'pgm.opts.ccdata.acker' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4
'pgm.opts.redirect.dlr' exists multiple times with NOT compatible types: FT_IPv6 and FT_IPv4

Change-Id: Iaf694699d108a12db172da8dd9fbab211adb329d
Reviewed-on: https://code.wireshark.org/review/14070
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>

21 files changed, 85 insertions, 86 deletions

diff --git a/epan/dissectors/packet-afp.c b/epan/dissectors/packet-afp.c
index e798a2004f..b1e1831589 100644
--- a/epan/dissectors/packet-afp.c
+++ b/epan/dissectors/packet-afp.c
@@ -7050,7 +7050,7 @@ proto_register_afp(void)
 		    NULL, HFILL }},
 
 		{ &hf_afp_unknown,
-		  { "Unknown parameter",         "afp.unknown",
+		  { "Unknown parameter",         "afp.unknown_bytes",
 		    FT_BYTES, BASE_NONE, NULL, 0x0,
 		    NULL, HFILL }},
 
@@ -7253,7 +7253,7 @@ proto_register_afp(void)
 		{ &ei_afp_abnormal_num_subqueries, { "afp.abnormal_num_subqueries", PI_PROTOCOL, PI_WARN, "Abnormal number of subqueries", EXPFILL }},
 		{ &ei_afp_too_many_acl_entries, { "afp.too_many_acl_entries", PI_UNDECODED, PI_WARN, "Too many ACL entries", EXPFILL }},
 		{ &ei_afp_ip_port_reused, { "afp.ip_port_reused", PI_SEQUENCE, PI_WARN, "IP port reused, you need to split the capture file", EXPFILL }},
-		{ &ei_afp_toc_offset, { "afp.toc_offset", PI_PROTOCOL, PI_WARN, "ToC offset bogus", EXPFILL }},
+		{ &ei_afp_toc_offset, { "afp.toc_offset.bogus", PI_PROTOCOL, PI_WARN, "ToC offset bogus", EXPFILL }},
 	};
 	expert_module_t* expert_afp;
 
diff --git a/epan/dissectors/packet-bootp.c b/epan/dissectors/packet-bootp.c
index 5415d0fec2..ceecda0276 100644
--- a/epan/dissectors/packet-bootp.c
+++ b/epan/dissectors/packet-bootp.c
@@ -6190,7 +6190,7 @@ proto_register_bootp(void)
 		    NULL, HFILL }},
 
 		{ &hf_bootp_client_identifier_enterprise_num,
-		  { "Enterprise-number", "bootp.client_id.iaid",
+		  { "Enterprise-number", "bootp.client_id.enterprise_num",
 		    FT_UINT32, BASE_DEC|BASE_EXT_STRING, &sminmpec_values_ext, 0x0,
 		    NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-bthfp.c b/epan/dissectors/packet-bthfp.c
index 1b495385e2..3810e86a3d 100644
--- a/epan/dissectors/packet-bthfp.c
+++ b/epan/dissectors/packet-bthfp.c
@@ -2525,7 +2525,7 @@ proto_register_bthfp(void)
            NULL, HFILL}
         },
         { &hf_chld_mode,
-           { "Mode",                             "bthfp.chld.mode",
+           { "Mode",                             "bthfp.chld.mode_value",
            FT_UINT8, BASE_DEC, VALS(chld_vals), 0,
            NULL, HFILL}
         },
diff --git a/epan/dissectors/packet-canopen.c b/epan/dissectors/packet-canopen.c
index 73ff314326..f00a3d9a10 100644
--- a/epan/dissectors/packet-canopen.c
+++ b/epan/dissectors/packet-canopen.c
@@ -1120,12 +1120,12 @@ proto_register_canopen(void)
             NULL, HFILL }
         },
         { &hf_canopen_pdo_data,
-          { "Data", "canopen.pdo.data",
+          { "Data", "canopen.pdo.data.bytes",
             FT_BYTES, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_canopen_pdo_data_string,
-          { "Data", "canopen.pdo.data",
+          { "Data", "canopen.pdo.data.string",
             FT_STRINGZ, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
@@ -1180,12 +1180,12 @@ proto_register_canopen(void)
             NULL, HFILL }
         },
         { &hf_canopen_sdo_data,
-          { "Data", "canopen.sdo.data",
+          { "Data", "canopen.sdo.data.bytes",
             FT_BYTES, BASE_NONE, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_canopen_sdo_abort_code,
-          { "Abort code", "canopen.sdo.data",
+          { "Abort code", "canopen.sdo.abort_code",
             FT_UINT32, BASE_HEX, VALS(sdo_abort_code), 0x0,
             NULL, HFILL }
         },
diff --git a/epan/dissectors/packet-ceph.c b/epan/dissectors/packet-ceph.c
index 25de4c49bd..bea70ad0dd 100644
--- a/epan/dissectors/packet-ceph.c
+++ b/epan/dissectors/packet-ceph.c
@@ -7508,7 +7508,7 @@ proto_register_ceph(void)
 			NULL, HFILL
 		} },
 		{ &hf_pgpool_tier, {
-			"Tier", "ceph.msg.",
+			"Tier", "ceph.msg.tier",
 			FT_UINT64, BASE_HEX, NULL, 0,
 			"A pool that is a tier of this tier.", HFILL
 		} },
@@ -7578,7 +7578,7 @@ proto_register_ceph(void)
 			"Fraction of cache to leave dirty.", HFILL
 		} },
 		{ &hf_pgpool_cache_targetfullratio, {
-			"Cache Target Full Ratio", "ceph.msg.",
+			"Cache Target Full Ratio", "ceph.msg.targetfullratio",
 			FT_UINT32, BASE_DEC, NULL, 0,
 			"Fraction of target to fill before evicting in earnest.", HFILL
 		} },
@@ -8889,7 +8889,7 @@ proto_register_ceph(void)
 			"The priority of this message, higher the more urgent.", HFILL
 		} },
 		{ &hf_head_version, {
-			"Version", "ceph.version",
+			"Version", "ceph.head_version",
 			FT_UINT16, BASE_DEC, NULL, 0,
 			NULL, HFILL
 		} },
diff --git a/epan/dissectors/packet-cip.c b/epan/dissectors/packet-cip.c
index 4a2ef18e13..e1258817e9 100644
--- a/epan/dissectors/packet-cip.c
+++ b/epan/dissectors/packet-cip.c
@@ -7463,9 +7463,9 @@ proto_register_cip(void)
       { &hf_cip_port_ex_link_addr, { "Extended Link Address", "cip.ex_linkaddress", FT_BOOLEAN, 8, TFS(&tfs_true_false), CI_PORT_SEG_EX_LINK_ADDRESS, NULL, HFILL }},
       { &hf_cip_port, { "Port", "cip.port", FT_UINT8, BASE_DEC, NULL, CI_PORT_SEG_PORT_ID_MASK, "Port Identifier", HFILL }},
       { &hf_cip_port_extended,{ "Port Extended", "cip.port", FT_UINT16, BASE_HEX, NULL, 0, "Port Identifier Extended", HFILL } },
-      { &hf_cip_link_address_byte, { "Link Address", "cip.linkaddress", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
+      { &hf_cip_link_address_byte, { "Link Address", "cip.linkaddress.byte", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
       { &hf_cip_link_address_size, { "Link Address Size", "cip.linkaddress_size", FT_UINT8, BASE_DEC, NULL, 0, NULL, HFILL }},
-      { &hf_cip_link_address_string, { "Link Address", "cip.linkaddress", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
+      { &hf_cip_link_address_string, { "Link Address", "cip.linkaddress.string", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL }},
       { &hf_cip_logical_seg_type, { "Logical Segment Type", "cip.logical_segment.type", FT_UINT8, BASE_DEC, VALS(cip_logical_segment_type_vals), CI_LOGICAL_SEG_TYPE_MASK, NULL, HFILL }},
       { &hf_cip_logical_seg_format, { "Logical Segment Format", "cip.logical_segment.format", FT_UINT8, BASE_DEC, VALS(cip_logical_segment_format_vals), CI_LOGICAL_SEG_FORMAT_MASK, NULL, HFILL }},
       { &hf_cip_class8, { "Class", "cip.class", FT_UINT8, BASE_HEX|BASE_EXT_STRING, &cip_class_names_vals_ext, 0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-dnp.c b/epan/dissectors/packet-dnp.c
index dec40482a3..956b523833 100644
--- a/epan/dissectors/packet-dnp.c
+++ b/epan/dissectors/packet-dnp.c
@@ -3987,49 +3987,49 @@ proto_register_dnp3(void)
     },
 
     { &hf_dnp3_al_ana16,
-      { "Value (16 bit)", "dnp3.al.ana",
+      { "Value (16 bit)", "dnp3.al.ana.int",
           FT_INT16, BASE_DEC, NULL, 0x0,
           "Analog Value (16 bit)", HFILL }
     },
 
     { &hf_dnp3_al_ana32,
-      { "Value (32 bit)", "dnp3.al.ana",
+      { "Value (32 bit)", "dnp3.al.ana.int",
           FT_INT32, BASE_DEC, NULL, 0x0,
           "Analog Value (32 bit)", HFILL }
     },
 
     { &hf_dnp3_al_anaflt,
-      { "Value (float)", "dnp3.al.ana",
+      { "Value (float)", "dnp3.al.ana.float",
           FT_FLOAT, BASE_NONE, NULL, 0x0,
           "Analog Value (float)", HFILL }
     },
 
     { &hf_dnp3_al_anadbl,
-      { "Value (double)", "dnp3.al.ana",
+      { "Value (double)", "dnp3.al.ana.double",
           FT_DOUBLE, BASE_NONE, NULL, 0x0,
           "Analog Value (double)", HFILL }
     },
 
     { &hf_dnp3_al_anaout16,
-      { "Output Value (16 bit)", "dnp3.al.anaout",
+      { "Output Value (16 bit)", "dnp3.al.anaout.int",
           FT_INT16, BASE_DEC, NULL, 0x0,
           NULL, HFILL }
     },
 
     { &hf_dnp3_al_anaout32,
-      { "Output Value (32 bit)", "dnp3.al.anaout",
+      { "Output Value (32 bit)", "dnp3.al.anaout.int",
           FT_INT32, BASE_DEC, NULL, 0x0,
           NULL, HFILL }
     },
 
     { &hf_dnp3_al_anaoutflt,
-      { "Output Value (float)", "dnp3.al.anaout",
+      { "Output Value (float)", "dnp3.al.anaout.float",
           FT_FLOAT, BASE_NONE, NULL, 0x0,
           NULL, HFILL }
     },
 
     { &hf_dnp3_al_anaoutdbl,
-      { "Output (double)", "dnp3.al.anaout",
+      { "Output (double)", "dnp3.al.anaout.double",
           FT_DOUBLE, BASE_NONE, NULL, 0x0,
           "Output Value (double)", HFILL }
     },
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index a475208b52..bdc72a1a7e 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -2175,7 +2175,7 @@ proto_register_bundle(void)
           FT_BOOLEAN, 8, NULL, BUNDLE_PROCFLAGS_APP_ACK_MASK, NULL, HFILL}
         },
         {&hf_bundle_control_flags,
-         {"Bundle Processing Control Flags", "bundle.primary.proc.flag",
+         {"Bundle Processing Control Flags", "bundle.control.flag",
           FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_procflags_general,
@@ -2243,7 +2243,7 @@ proto_register_bundle(void)
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_primary_timestamp_seq_num64,
-         {"Timestamp Sequence Number", "bundle.primary.timestamp_seq_num",
+         {"Timestamp Sequence Number", "bundle.primary.timestamp_seq_num64",
           FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_primary_timestamp_seq_num32,
@@ -2255,67 +2255,67 @@ proto_register_bundle(void)
           FT_ABSOLUTE_TIME, ABSOLUTE_TIME_LOCAL, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_dest_scheme_offset_u16,
-         {"Destination Scheme Offset", "bundle.primary.destschemeoff",
+         {"Destination Scheme Offset", "bundle.primary.destschemeoff_u16",
           FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_dest_scheme_offset_i32,
-         {"Destination Scheme Offset", "bundle.primary.destschemeoff",
+         {"Destination Scheme Offset", "bundle.primary.destschemeoff_i32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_dest_ssp_offset_u16,
-         {"Destination SSP Offset", "bundle.primary.destssspoff",
+         {"Destination SSP Offset", "bundle.primary.destssspoff_u16",
           FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_dest_ssp_offset_i32,
-         {"Destination SSP Offset", "bundle.primary.destssspoff",
+         {"Destination SSP Offset", "bundle.primary.destssspoff_i32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_source_scheme_offset_u16,
-         {"Source Scheme Offset", "bundle.primary.srcschemeoff",
+         {"Source Scheme Offset", "bundle.primary.srcschemeoff_u16",
           FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_source_scheme_offset_i32,
-         {"Source Scheme Offset", "bundle.primary.srcschemeoff",
+         {"Source Scheme Offset", "bundle.primary.srcschemeoff_i32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_source_ssp_offset_u16,
-         {"Source SSP Offset", "bundle.primary.srcsspoff",
+         {"Source SSP Offset", "bundle.primary.srcsspoff_u16",
           FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_source_ssp_offset_i32,
-         {"Source SSP Offset", "bundle.primary.srcsspoff",
+         {"Source SSP Offset", "bundle.primary.srcsspoff_i32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_report_scheme_offset_u16,
-         {"Report Scheme Offset", "bundle.primary.rptschemeoff",
+         {"Report Scheme Offset", "bundle.primary.rptschemeoff_u16",
           FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_report_scheme_offset_i32,
-         {"Report Scheme Offset", "bundle.primary.rptschemeoff",
+         {"Report Scheme Offset", "bundle.primary.rptschemeoff_i32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_report_ssp_offset_u16,
-         {"Report SSP Offset", "bundle.primary.rptsspoff",
+         {"Report SSP Offset", "bundle.primary.rptsspoff_u16",
           FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_report_ssp_offset_i32,
-         {"Report SSP Offset", "bundle.primary.rptsspoff",
+         {"Report SSP Offset", "bundle.primary.rptsspoff_i32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_cust_scheme_offset_u16,
-         {"Custodian Scheme Offset", "bundle.primary.custschemeoff",
+         {"Custodian Scheme Offset", "bundle.primary.custschemeoff_u16",
           FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_cust_scheme_offset_i32,
-         {"Custodian Scheme Offset", "bundle.primary.custschemeoff",
+         {"Custodian Scheme Offset", "bundle.primary.custschemeoff_i32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_cust_ssp_offset_u16,
-         {"Custodian SSP Offset", "bundle.primary.custsspoff",
+         {"Custodian SSP Offset", "bundle.primary.custsspoff_u16",
           FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_cust_ssp_offset_i32,
-         {"Custodian SSP Offset", "bundle.primary.custsspoff",
+         {"Custodian SSP Offset", "bundle.primary.custsspoff_i32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_dest_scheme,
@@ -2359,7 +2359,7 @@ proto_register_bundle(void)
           FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_lifetime_sdnv,
-         {"Lifetime", "bundle.primary.lifetime",
+         {"Lifetime", "bundle.primary.lifetime_sdnv",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_payload_length,
@@ -2435,7 +2435,7 @@ proto_register_bundle(void)
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_admin_timestamp_seq_num64,
-         {"Timestamp Sequence Number", "bundle.admin.timestamp_seq_num",
+         {"Timestamp Sequence Number", "bundle.admin.timestamp_seq_num64",
           FT_INT64, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_admin_timestamp_seq_num32,
diff --git a/epan/dissectors/packet-dvb-s2-bb.c b/epan/dissectors/packet-dvb-s2-bb.c
index f7fdd1fa47..7cf48af1d2 100644
--- a/epan/dissectors/packet-dvb-s2-bb.c
+++ b/epan/dissectors/packet-dvb-s2-bb.c
@@ -1031,7 +1031,7 @@ void proto_register_dvb_s2_modeadapt(void)
                 "Protocol Type", HFILL}
         },
         {&hf_dvb_s2_gse_label6, {
-                "Label", "dvb-s2_gse.label",
+                "Label", "dvb-s2_gse.label_ether",
                 FT_ETHER, BASE_NONE, NULL, 0x0,
                 "Label Field", HFILL}
         },
diff --git a/epan/dissectors/packet-fcdns.c b/epan/dissectors/packet-fcdns.c
index 7c4615a32a..e79e382838 100644
--- a/epan/dissectors/packet-fcdns.c
+++ b/epan/dissectors/packet-fcdns.c
@@ -282,7 +282,7 @@ static header_field_info hfi_fcdns_rply_nname FCDNS_HFI_INIT =
            HFILL};
 
 static header_field_info hfi_fcdns_rply_gft FCDNS_HFI_INIT =
-          {"FC-4 Types Supported", "fcdns.rply.fc4type", FT_NONE, BASE_NONE,
+          {"FC-4 Types Supported", "fcdns.rply.gft", FT_NONE, BASE_NONE,
            NULL, 0x0, NULL, HFILL};
 
 static header_field_info hfi_fcdns_rply_snamelen FCDNS_HFI_INIT =
@@ -302,7 +302,7 @@ static header_field_info hfi_fcdns_rply_fpname FCDNS_HFI_INIT =
            0x0, NULL, HFILL};
 
 static header_field_info hfi_fcdns_fc4type FCDNS_HFI_INIT =
-          {"FC-4 Types", "fcdns.req.fc4type", FT_NONE, BASE_NONE,
+          {"FC-4 Types", "fcdns.req.fc4types", FT_NONE, BASE_NONE,
            NULL, 0x0, NULL, HFILL};
 
 static header_field_info hfi_fcdns_rply_fc4type FCDNS_HFI_INIT =
diff --git a/epan/dissectors/packet-icmp.c b/epan/dissectors/packet-icmp.c
index c798afdab3..8c66961d16 100644
--- a/epan/dissectors/packet-icmp.c
+++ b/epan/dissectors/packet-icmp.c
@@ -1953,20 +1953,19 @@ void proto_register_icmp(void)
 		  HFILL}},
 		{&hf_icmp_int_info_ipaddr,
 		 {"IP Address", "icmp.int_info.ipaddr", FT_BOOLEAN, 8,
-		  NULL,
+		  TFS(&tfs_present_not_present),
 		  INT_INFO_IPADDR,
-		  "True: IP Address Sub-Object present; False: IP Address Sub-Object not present",
-		  HFILL}},
+		  NULL, HFILL}},
 		{&hf_icmp_int_info_name,
-		 {"Interface Name", "icmp.int_info.name", FT_BOOLEAN, 8,
-		  NULL,
+		 {"Interface Name", "icmp.int_info.name_present", FT_BOOLEAN, 8,
+		  TFS(&tfs_present_not_present),
 		  INT_INFO_NAME,
-		  "True: Interface Name Sub-Object present; False: Interface Name Sub-Object not present",
+		  NULL,
 		  HFILL}},
 		{&hf_icmp_int_info_mtu,
-		 {"MTU", "icmp.int_info.mtu", FT_BOOLEAN, 8, NULL,
+		 {"MTU", "icmp.int_info.mtu", FT_BOOLEAN, 8, TFS(&tfs_present_not_present),
 		  INT_INFO_MTU,
-		  "True: MTU present; False: MTU not present", HFILL}},
+		  NULL, HFILL}},
 		{&hf_icmp_int_info_index,
 		 {"Interface Index", "icmp.int_info.index",
 		  FT_UINT32, BASE_DEC,
diff --git a/epan/dissectors/packet-icmpv6.c b/epan/dissectors/packet-icmpv6.c
index cfc6144452..4774453386 100644
--- a/epan/dissectors/packet-icmpv6.c
+++ b/epan/dissectors/packet-icmpv6.c
@@ -5247,13 +5247,13 @@ proto_register_icmpv6(void)
           { "Num of Locs", "icmpv6.ilnp.nb_locs", FT_UINT8, BASE_DEC, NULL, 0x0,
             "The number of 64-bit Locator values that are advertised in this message", HFILL }},
         { &hf_icmpv6_ilnp_locator,
-          { "Locator", "icmpv6.ilnp.nb_locs", FT_UINT64, BASE_HEX, NULL, 0x0,
+          { "Locator", "icmpv6.ilnp.nb_locator", FT_UINT64, BASE_HEX, NULL, 0x0,
             "The 64-bit Locator values currently valid for the sending ILNPv6 node", HFILL }},
         { &hf_icmpv6_ilnp_preference,
-          { "Preference", "icmpv6.ilnp.nb_locs", FT_UINT32, BASE_DEC, NULL, 0x0,
+          { "Preference", "icmpv6.ilnp.nb_preference", FT_UINT32, BASE_DEC, NULL, 0x0,
             "The preferability of each Locator relative to other valid Locator values", HFILL }},
         { &hf_icmpv6_ilnp_lifetime,
-          { "Lifetime", "icmpv6.ilnp.nb_locs", FT_UINT32, BASE_DEC, NULL, 0x0,
+          { "Lifetime", "icmpv6.ilnp.nb_lifetime", FT_UINT32, BASE_DEC, NULL, 0x0,
             "The maximum number of seconds that this particular Locator may be considered valid", HFILL }},
 
         /* 6lowpan-nd: Neighbour Discovery for 6LoWPAN Networks */
diff --git a/epan/dissectors/packet-ieee17221.c b/epan/dissectors/packet-ieee17221.c
index 5bb9463392..5959285340 100644
--- a/epan/dissectors/packet-ieee17221.c
+++ b/epan/dissectors/packet-ieee17221.c
@@ -5242,13 +5242,13 @@ proto_register_17221(void)
 
       /* SET_CLOCK_SOURCE / GET_CLOCK_SOURCE */
       { &hf_aecp_clock_source_id,
-         { "Clock Source ID", "ieee17221.clock_source_id",
+         { "Clock Source ID", "ieee17221.clock_source_id64",
             FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
 
       /* SET_STREAM_FORMAT */
       { &hf_aecp_stream_format,
-         {"Stream Format", "ieee17221.stream_format",
+         {"Stream Format", "ieee17221.stream_format64",
             FT_UINT64, BASE_HEX, NULL, 0x00, NULL, HFILL }
       },
       /* GET_STREAM_FORMAT */
diff --git a/epan/dissectors/packet-isi.c b/epan/dissectors/packet-isi.c
index 0a3afe1577..c3f98504bc 100644
--- a/epan/dissectors/packet-isi.c
+++ b/epan/dissectors/packet-isi.c
@@ -2058,7 +2058,7 @@ proto_register_isi(void)
 		{ &hf_isi_network_status_sub_cid,
 		  { "Cell ID (CID)", "isi.network.sub.cid", FT_UINT32, BASE_HEX_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_isi_network_status_sub_msg_len,
-		  { "Message Length", "isi.network.sub.msg", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "Message Length", "isi.network.sub.msg_len", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_isi_network_status_sub_msg,
 		  { "Message", "isi.network.sub.msg", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_isi_network_cell_info_sub_type,
diff --git a/epan/dissectors/packet-mausb.c b/epan/dissectors/packet-mausb.c
index 9d2857bee0..54a1e36be2 100644
--- a/epan/dissectors/packet-mausb.c
+++ b/epan/dissectors/packet-mausb.c
@@ -2106,7 +2106,7 @@ proto_register_mausb(void)
             }
         },
         { &hf_mausb_clear_transfers_status_block,
-            { "Cancel Transfers Status Block", "mausb.clear_transfers.status", FT_NONE, 0,
+            { "Cancel Transfers Status Block", "mausb.clear_transfers.status_block", FT_NONE, 0,
               NULL, 0, NULL, HFILL
             }
         },
diff --git a/epan/dissectors/packet-mikey.c b/epan/dissectors/packet-mikey.c
index d0da79454e..403378b60f 100644
--- a/epan/dissectors/packet-mikey.c
+++ b/epan/dissectors/packet-mikey.c
@@ -1460,7 +1460,7 @@ proto_register_mikey(void)
 		    FT_UINT8, BASE_DEC, VALS(payload_vals), 0x0,
 		    NULL, HFILL }},
 		{ &hf_mikey[POS_HDR_V],
-		  { "V", "mikey.v",
+		  { "V", "mikey.v.set",
 		    FT_BOOLEAN, 8, TFS(&tfs_set_notset), 0x80,
 		    NULL, HFILL }},
 		{ &hf_mikey[POS_HDR_PRF_FUNC],
diff --git a/epan/dissectors/packet-mswsp.c b/epan/dissectors/packet-mswsp.c
index e74a909d38..9ef7aea258 100644
--- a/epan/dissectors/packet-mswsp.c
+++ b/epan/dissectors/packet-mswsp.c
@@ -6981,14 +6981,14 @@ proto_register_mswsp(void)
 		{
 			&hf_mswsp_rangeboundry_cclabel,
 			{
-				"ccLabel", "mswsp.rangeboundry.ultype",
+				"ccLabel", "mswsp.rangeboundry.cclabel",
 				FT_UINT32, BASE_DEC, NULL, 0, NULL, HFILL
 			}
 		},
 		{
 			&hf_mswsp_rangeboundry_label,
 			{
-				"Label", "mswsp.rangeboundry.ultype",
+				"Label", "mswsp.rangeboundry.label",
 				FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL
 			}
 		},
@@ -7233,7 +7233,7 @@ proto_register_mswsp(void)
 		{
 			&hf_mswsp_arrayvector_address32,
 			{
-				"address of array", "mswsp.arrayvector.address64",
+				"address of array", "mswsp.arrayvector.address",
 				FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL
 			}
 		},
diff --git a/epan/dissectors/packet-nlm.c b/epan/dissectors/packet-nlm.c
index 3230ba9555..5b163de872 100644
--- a/epan/dissectors/packet-nlm.c
+++ b/epan/dissectors/packet-nlm.c
@@ -1137,13 +1137,13 @@ proto_register_nlm(void)
 			"svid", "nlm.lock.svid", FT_UINT32, BASE_DEC,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_l_offset64, {
-			"l_offset", "nlm.lock.l_offset", FT_UINT64, BASE_DEC,
+			"l_offset", "nlm.lock.l_offset64", FT_UINT64, BASE_DEC,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_l_offset, {
 			"l_offset", "nlm.lock.l_offset", FT_UINT32, BASE_DEC,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_l_len64, {
-			"l_len", "nlm.lock.l_len", FT_UINT64, BASE_DEC,
+			"l_len", "nlm.lock.l_len64", FT_UINT64, BASE_DEC,
 			NULL, 0, NULL, HFILL }},
 		{ &hf_nlm_lock_l_len, {
 			"l_len", "nlm.lock.l_len", FT_UINT32, BASE_DEC,
diff --git a/epan/dissectors/packet-pflog.c b/epan/dissectors/packet-pflog.c
index a5c2a16770..f26a44b15d 100644
--- a/epan/dissectors/packet-pflog.c
+++ b/epan/dissectors/packet-pflog.c
@@ -357,22 +357,22 @@ proto_register_pflog(void)
       { "Padding", "pflog.pad", FT_BYTES, BASE_NONE, NULL, 0x0,
         "Must be Zero", HFILL }},
     { &hf_pflog_saddr_ipv4,
-      { "Source Address", "pflog.saddr", FT_IPv4, BASE_NONE, NULL, 0x0,
+      { "Source Address", "pflog.saddr.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_pflog_daddr_ipv4,
-      { "Destination Address", "pflog.daddr", FT_IPv4, BASE_NONE, NULL, 0x0,
+      { "Destination Address", "pflog.daddr.ipv4", FT_IPv4, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_pflog_saddr_ipv6,
-      { "Source Address", "pflog.saddr", FT_IPv6, BASE_NONE, NULL, 0x0,
+      { "Source Address", "pflog.saddr.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_pflog_daddr_ipv6,
-      { "Destination Address", "pflog.daddr", FT_IPv6, BASE_NONE, NULL, 0x0,
+      { "Destination Address", "pflog.daddr.ipv6", FT_IPv6, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_pflog_saddr,
-      { "Source Address", "pflog.saddr", FT_BYTES, BASE_NONE, NULL, 0x0,
+      { "Source Address", "pflog.saddr.bytes", FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_pflog_daddr,
-      { "Destination Address", "pflog.daddr", FT_BYTES, BASE_NONE, NULL, 0x0,
+      { "Destination Address", "pflog.daddr.bytes", FT_BYTES, BASE_NONE, NULL, 0x0,
         NULL, HFILL }},
     { &hf_pflog_sport,
       { "Source Port", "pflog.sport", FT_UINT16, BASE_DEC, NULL, 0x0,
diff --git a/epan/dissectors/packet-pgm.c b/epan/dissectors/packet-pgm.c
index 5c8823ccba..2be8d4370c 100644
--- a/epan/dissectors/packet-pgm.c
+++ b/epan/dissectors/packet-pgm.c
@@ -1146,10 +1146,10 @@ proto_register_pgm(void)
 		  { "Reserved", "pgm.spm.res", FT_UINT16, BASE_HEX,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_spm_path,
-		  { "Path NLA", "pgm.spm.path", FT_IPv4, BASE_NONE,
+		  { "Path NLA", "pgm.spm.path.ipv4", FT_IPv4, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_spm_path6,
-		  { "Path NLA", "pgm.spm.path", FT_IPv6, BASE_NONE,
+		  { "Path NLA", "pgm.spm.path.ipv6", FT_IPv6, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 #if 0
 		{ &hf_pgm_data_sqn,
@@ -1171,10 +1171,10 @@ proto_register_pgm(void)
 		  { "Reserved", "pgm.nak.srcres", FT_UINT16, BASE_HEX,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_nak_src,
-		  { "Source NLA", "pgm.nak.src", FT_IPv4, BASE_NONE,
+		  { "Source NLA", "pgm.nak.src.ipv4", FT_IPv4, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_nak_src6,
-		  { "Source NLA", "pgm.nak.src", FT_IPv6, BASE_NONE,
+		  { "Source NLA", "pgm.nak.src.ipv6", FT_IPv6, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_nak_grpafi,
 		  { "Multicast Group AFI", "pgm.nak.grpafi", FT_UINT16, BASE_DEC,
@@ -1183,10 +1183,10 @@ proto_register_pgm(void)
 		  { "Reserved", "pgm.nak.grpres", FT_UINT16, BASE_HEX,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_nak_grp,
-		  { "Multicast Group NLA", "pgm.nak.grp", FT_IPv4, BASE_NONE,
+		  { "Multicast Group NLA", "pgm.nak.grp.ipv4", FT_IPv4, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_nak_grp6,
-		  { "Multicast Group NLA", "pgm.nak.grp", FT_IPv6, BASE_NONE,
+		  { "Multicast Group NLA", "pgm.nak.grp.ipv6", FT_IPv6, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_poll_sqn,
 		  { "Sequence Number", "pgm.poll.sqn", FT_UINT32, BASE_HEX,
@@ -1204,10 +1204,10 @@ proto_register_pgm(void)
 		  { "Reserved", "pgm.poll.res", FT_UINT16, BASE_HEX,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_poll_path,
-		  { "Path NLA", "pgm.poll.path", FT_IPv4, BASE_NONE,
+		  { "Path NLA", "pgm.poll.path.ipv4", FT_IPv4, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_poll_path6,
-		  { "Path NLA", "pgm.poll.path", FT_IPv6, BASE_NONE,
+		  { "Path NLA", "pgm.poll.path.ipv6", FT_IPv6, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_poll_backoff_ivl,
 		  { "Back-off Interval", "pgm.poll.backoff_ivl", FT_UINT32, BASE_DEC,
@@ -1293,10 +1293,10 @@ proto_register_pgm(void)
 		  { "Reserved", "pgm.opts.ccdata.res2", FT_UINT16, BASE_DEC,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_opt_ccdata_acker,
-		  { "Acker", "pgm.opts.ccdata.acker", FT_IPv4, BASE_NONE,
+		  { "Acker", "pgm.opts.ccdata.acker.ipv4", FT_IPv4, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_opt_ccdata_acker6,
-		  { "Acker", "pgm.opts.ccdata.acker", FT_IPv6, BASE_NONE,
+		  { "Acker", "pgm.opts.ccdata.acker.ipv6", FT_IPv6, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_opt_ccfeedbk_res,
 		  { "Reserved", "pgm.opts.ccdata.res", FT_UINT8, BASE_DEC,
@@ -1311,10 +1311,10 @@ proto_register_pgm(void)
 		  { "Loss Rate", "pgm.opts.ccdata.lossrate", FT_UINT16, BASE_HEX,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_opt_ccfeedbk_acker,
-		  { "Acker", "pgm.opts.ccdata.acker", FT_IPv4, BASE_NONE,
+		  { "Acker", "pgm.opts.ccdata.acker.ipv4", FT_IPv4, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_opt_ccfeedbk_acker6,
-		  { "Acker", "pgm.opts.ccdata.acker", FT_IPv6, BASE_NONE,
+		  { "Acker", "pgm.opts.ccdata.acker.ipv6", FT_IPv6, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_opt_nak_bo_ivl_res,
 		  { "Reserved", "pgm.opts.nak_bo_ivl.res", FT_UINT8, BASE_HEX,
@@ -1344,10 +1344,10 @@ proto_register_pgm(void)
 		  { "Reserved", "pgm.opts.redirect.res2", FT_UINT16, BASE_HEX,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_opt_redirect_dlr,
-		  { "DLR", "pgm.opts.redirect.dlr", FT_IPv4, BASE_NONE,
+		  { "DLR", "pgm.opts.redirect.dlr.ipv4", FT_IPv4, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_opt_redirect_dlr6,
-		  { "DLR", "pgm.opts.redirect.dlr", FT_IPv6, BASE_NONE,
+		  { "DLR", "pgm.opts.redirect.dlr.ipv6", FT_IPv6, BASE_NONE,
 		    NULL, 0x0, NULL, HFILL }},
 		{ &hf_pgm_opt_fragment_res,
 		  { "Reserved", "pgm.opts.fragment.res", FT_UINT8, BASE_HEX,
diff --git a/epan/dissectors/packet-ssl-utils.h b/epan/dissectors/packet-ssl-utils.h
index 41d3683626..272dcb3f8b 100644
--- a/epan/dissectors/packet-ssl-utils.h
+++ b/epan/dissectors/packet-ssl-utils.h
@@ -1000,7 +1000,7 @@ ssl_common_dissect_t name = {   \
         NULL, HFILL }                                                   \
     },                                                                  \
     { & name .hf.hs_ext_cert_url_url,                                   \
-      { "URL", prefix ".handshake.cert_url.url_hash_len",               \
+      { "URL", prefix ".handshake.cert_url.url",                        \
         FT_STRING, BASE_NONE, NULL, 0x0,                                \
         "URL used to fetch the certificate(s)", HFILL }                 \
     },                                                                  \