Separate hf_ fields that share filter names with FT_UINT32 and FT_UINT64 datatypes.

'bitcoin.addr.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.inv.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.getdata.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.notfound.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.getblocks.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.getheaders.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.tx.input_count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.tx.in.script_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.tx.output_count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.tx.out.script_length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.block.num_transactions' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.headers.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.merkleblock.flags.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.merkleblock.hashes.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.string.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'bitcoin.data.count' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'dcerpc.referent_id' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'dmp.body.id' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'edonkey.start_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'edonkey.end_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.entry' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.phoff' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.shoff' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_vaddr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_paddr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_filesz' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_memsz' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.p_align' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_addr' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_offset' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_addralign' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.sh_entsize' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.symbol_table.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.symbol_table.size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.tag' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.value' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.pointer' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.ignored' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'elf.dynamic.unspecified' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'h248.contextId' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'hcrt.data32' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'wlan_mgt.fixed.psmp.stainfo.reserved' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'isakmp.tf.attr.life_duration' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'isakmp.ike.attr.life_duration' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'jxta.message.element.content.length' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'rmt-lct.tsi' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'rmt-lct.toi' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'smb.alloc_size' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32
'trmac.response_code' exists multiple times with NOT compatible types: FT_UINT64 and FT_UINT32

Change-Id: I903933e6448bac3d3374eef1a6a0bc4771c1a9f4
Reviewed-on: https://code.wireshark.org/review/14060
Reviewed-by: Michael Mann <mmann78@netscape.net>

14 files changed, 59 insertions, 59 deletions

diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c
index 65fb14d18f..58e9112a13 100644
--- a/asn1/h248/packet-h248-template.c
+++ b/asn1/h248/packet-h248-template.c
@@ -1567,7 +1567,7 @@ void proto_register_h248(void) {
             FT_STRING, BASE_NONE, NULL, 0,
             "h248.IA5String", HFILL }},
         { &hf_h248_context_id64,
-          { "contextId", "h248.contextId",
+          { "contextId", "h248.contextId64",
             FT_UINT64, BASE_HEX, NULL, 0,
             "Context ID", HFILL }},
         { &hf_h248_transactionId64,
diff --git a/epan/dissectors/file-elf.c b/epan/dissectors/file-elf.c
index 9937fb6338..d45b844aed 100644
--- a/epan/dissectors/file-elf.c
+++ b/epan/dissectors/file-elf.c
@@ -1842,7 +1842,7 @@ proto_register_elf(void)
             "This member gives the virtual address to which the system first transfers control, thus starting the process. If the file has no associated entry point, this member holds zero. ", HFILL }
         },
         { &hf_elf64_entry,
-            { "Entry",                                     "elf.entry",
+            { "Entry",                                     "elf.entry64",
             FT_UINT64, BASE_HEX, NULL, 0x00,
             "This member gives the virtual address to which the system first transfers control, thus starting the process. If the file has no associated entry point, this member holds zero. ", HFILL }
         },
@@ -1852,7 +1852,7 @@ proto_register_elf(void)
             "This member holds the program header table's file offset in bytes. If the file has no program header table, this member holds zero.", HFILL }
         },
         { &hf_elf64_phoff,
-            { "Program Header Table File Offset",          "elf.phoff",
+            { "Program Header Table File Offset",          "elf.phoff64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             "This member holds the program header table's file offset in bytes. If the file has no program header table, this member holds zero.", HFILL }
         },
@@ -1862,7 +1862,7 @@ proto_register_elf(void)
             "This member holds the section header table's file offset in bytes. If the file has no section header table, this member holds zero.", HFILL }
         },
         { &hf_elf64_shoff,
-            { "Section Header Table File Offset",          "elf.shoff",
+            { "Section Header Table File Offset",          "elf.shoff64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             "This member holds the section header table's file offset in bytes. If the file has no section header table, this member holds zero.", HFILL }
         },
@@ -1923,7 +1923,7 @@ proto_register_elf(void)
             "This member gives the offset from the beginning of the file at which the first byte of the segment resides.", HFILL }
         },
         { &hf_elf64_p_offset,
-            { "File Offset",                               "elf.p_offset",
+            { "File Offset",                               "elf.p_offset64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             "This member gives the offset from the beginning of the file at which the first byte of the segment resides.", HFILL }
         },
@@ -1933,7 +1933,7 @@ proto_register_elf(void)
             "This member gives the virtual address at which the first byte of the segment resides in memory.", HFILL }
         },
         { &hf_elf64_p_vaddr,
-            { "Virtual Address",                           "elf.p_vaddr",
+            { "Virtual Address",                           "elf.p_vaddr64",
             FT_UINT64, BASE_HEX, NULL, 0x00,
             "This member gives the virtual address at which the first byte of the segment resides in memory.", HFILL }
         },
@@ -1943,7 +1943,7 @@ proto_register_elf(void)
             "On systems for which physical addressing is relevant, this member is reserved for the segment's physical address. Because System V ignores physical addressing for application programs, this member has unspecified contents for executable files and shared objects.", HFILL }
         },
         { &hf_elf64_p_paddr,
-            { "Physical Address",                          "elf.p_paddr",
+            { "Physical Address",                          "elf.p_paddr64",
             FT_UINT64, BASE_HEX, NULL, 0x00,
             "On systems for which physical addressing is relevant, this member is reserved for the segment's physical address. Because System V ignores physical addressing for application programs, this member has unspecified contents for executable files and shared objects.", HFILL }
         },
@@ -1953,7 +1953,7 @@ proto_register_elf(void)
             "This member gives the number of bytes in the file image of the segment; it may be zero.", HFILL }
         },
         { &hf_elf64_p_filesz,
-            { "File Image Size",                           "elf.p_filesz",
+            { "File Image Size",                           "elf.p_filesz64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             "This member gives the number of bytes in the file image of the segment; it may be zero.", HFILL }
         },
@@ -1963,7 +1963,7 @@ proto_register_elf(void)
             "This member gives the number of bytes in the memory image of the segment; it may be zero.", HFILL }
         },
         { &hf_elf64_p_memsz,
-            { "Memory Image Size",                         "elf.p_memsz",
+            { "Memory Image Size",                         "elf.p_memsz64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             "This member gives the number of bytes in the memory image of the segment; it may be zero.", HFILL }
         },
@@ -2003,7 +2003,7 @@ proto_register_elf(void)
             "This member gives the value to which the segments are aligned in memory and in the file. Values 0 and 1 mean no alignment is required. Otherwise, p_align should be a positive, integral power of 2, and p_vaddr should equal p_offset, modulo p_align.", HFILL }
         },
         { &hf_elf64_p_align,
-            { "Align",                                     "elf.p_align",
+            { "Align",                                     "elf.p_align64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             "This member gives the value to which the segments are aligned in memory and in the file. Values 0 and 1 mean no alignment is required. Otherwise, p_align should be a positive, integral power of 2, and p_vaddr should equal p_offset, modulo p_align.", HFILL }
         },
@@ -2109,7 +2109,7 @@ proto_register_elf(void)
             "If the section will appear in the memory image of a process, this member gives the address at which the section's first byte should reside. Otherwise, the member contains 0.", HFILL }
         },
         { &hf_elf64_sh_addr,
-            { "Address",                                   "elf.sh_addr",
+            { "Address",                                   "elf.sh_addr64",
             FT_UINT64, BASE_HEX, NULL, 0x00,
             "If the section will appear in the memory image of a process, this member gives the address at which the section's first byte should reside. Otherwise, the member contains 0.", HFILL }
         },
@@ -2119,7 +2119,7 @@ proto_register_elf(void)
             "This member's value gives the byte offset from the beginning of the file to the first byte in the section. One section type, SHT_NOBITS, occupies no space in the file, and its sh_offset member locates the conceptual placement in the file.", HFILL }
         },
         { &hf_elf64_sh_offset,
-            { "File Offset",                               "elf.sh_offset",
+            { "File Offset",                               "elf.sh_offset64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             "This member's value gives the byte offset from the beginning of the file to the first byte in the section. One section type, SHT_NOBITS, occupies no space in the file, and its sh_offset member locates the conceptual placement in the file.", HFILL }
         },
@@ -2129,7 +2129,7 @@ proto_register_elf(void)
             "This member gives the section's size in bytes.", HFILL }
         },
         { &hf_elf64_sh_size,
-            { "Size",                                      "elf.sh_size",
+            { "Size",                                      "elf.sh_size64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             "This member gives the section's size in bytes.", HFILL }
         },
@@ -2150,7 +2150,7 @@ proto_register_elf(void)
             "Some sections have address alignment constraints. Currently, only 0 and positive integral powers of two are allowed. Values 0 and 1 mean the section has no alignment constraints.", HFILL }
         },
         { &hf_elf64_sh_addralign,
-            { "Address Alignment",                         "elf.sh_addralign",
+            { "Address Alignment",                         "elf.sh_addralign64",
             FT_UINT64, BASE_HEX, NULL, 0x00,
             "Some sections have address alignment constraints. Currently, only 0 and positive integral powers of two are allowed. Values 0 and 1 mean the section has no alignment constraints.", HFILL }
         },
@@ -2160,7 +2160,7 @@ proto_register_elf(void)
             "Some sections hold a table of fixed-size entries, such as a symbol table. For such a section, this member gives the size in bytes of each entry. The member contains 0 if the section does not hold a table of fixed-size entries.", HFILL }
         },
         { &hf_elf64_sh_entsize,
-            { "Entry Size",                                "elf.sh_entsize",
+            { "Entry Size",                                "elf.sh_entsize64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             "Some sections hold a table of fixed-size entries, such as a symbol table. For such a section, this member gives the size in bytes of each entry. The member contains 0 if the section does not hold a table of fixed-size entries.", HFILL }
         },
@@ -2344,7 +2344,7 @@ proto_register_elf(void)
             NULL, HFILL }
         },
         { &hf_elf64_symbol_table_value,
-            { "Value",                                     "elf.symbol_table.value",
+            { "Value",                                     "elf.symbol_table.value64",
             FT_UINT64, BASE_HEX, NULL, 0x00,
             NULL, HFILL }
         },
@@ -2354,7 +2354,7 @@ proto_register_elf(void)
             NULL, HFILL }
         },
         { &hf_elf64_symbol_table_size,
-            { "Size",                                      "elf.symbol_table.size",
+            { "Size",                                      "elf.symbol_table.size64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             NULL, HFILL }
         },
@@ -2386,27 +2386,27 @@ proto_register_elf(void)
             NULL, HFILL }
         },
         { &hf_elf64_dynamic_tag,
-            { "Tag",                                       "elf.dynamic.tag",
+            { "Tag",                                       "elf.dynamic.tag64",
             FT_UINT64, BASE_HEX /*| BASE_RANGE_STRING*/, NULL /*RVALS(dynamic_tag_rvals)*/, 0x00,
             NULL, HFILL }
         },
         { &hf_elf64_dynamic_value,
-            { "Value",                                     "elf.dynamic.value",
+            { "Value",                                     "elf.dynamic.value64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_elf64_dynamic_pointer,
-            { "Pointer",                                   "elf.dynamic.pointer",
+            { "Pointer",                                   "elf.dynamic.pointer64",
             FT_UINT64, BASE_HEX, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_elf64_dynamic_ignored,
-            { "Ignored",                                   "elf.dynamic.ignored",
+            { "Ignored",                                   "elf.dynamic.ignored64",
             FT_UINT64, BASE_HEX, NULL, 0x00,
             NULL, HFILL }
         },
         { &hf_elf64_dynamic_unspecified,
-            { "Unspecified",                               "elf.dynamic.unspecified",
+            { "Unspecified",                               "elf.dynamic.unspecified64",
             FT_UINT64, BASE_DEC_HEX, NULL, 0x00,
             NULL, HFILL }
         },
diff --git a/epan/dissectors/packet-bitcoin.c b/epan/dissectors/packet-bitcoin.c
index 31461d28b2..091582c1a9 100644
--- a/epan/dissectors/packet-bitcoin.c
+++ b/epan/dissectors/packet-bitcoin.c
@@ -157,7 +157,7 @@ static header_field_info hfi_msg_addr_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.addr.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_addr_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.addr.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.addr.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_bitcoin_msg_addr BITCOIN_HFI_INIT =
   { "Address message", "bitcoin.addr", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -179,7 +179,7 @@ static header_field_info hfi_msg_inv_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.inv.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_inv_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.inv.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.inv.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_bitcoin_msg_inv BITCOIN_HFI_INIT =
   { "Inventory message", "bitcoin.inv", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -204,7 +204,7 @@ static header_field_info hfi_msg_getdata_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.getdata.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_getdata_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.getdata.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.getdata.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_getdata_type BITCOIN_HFI_INIT =
   { "Type", "bitcoin.getdata.type", FT_UINT32, BASE_DEC, VALS(inv_types), 0x0, NULL, HFILL };
@@ -223,7 +223,7 @@ static header_field_info hfi_msg_notfound_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.notfound.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_notfound_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.notfound.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.notfound.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_bitcoin_msg_notfound BITCOIN_HFI_INIT =
   { "Getdata message", "bitcoin.notfound", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -245,7 +245,7 @@ static header_field_info hfi_msg_getblocks_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.getblocks.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_getblocks_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.getblocks.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.getblocks.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_bitcoin_msg_getblocks BITCOIN_HFI_INIT =
   { "Getdata message", "bitcoin.getblocks", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -267,7 +267,7 @@ static header_field_info hfi_msg_getheaders_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.getheaders.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_getheaders_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.getheaders.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.getheaders.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 #if 0
 static header_field_info hfi_msg_getheaders_version BITCOIN_HFI_INIT =
@@ -294,7 +294,7 @@ static header_field_info hfi_msg_tx_in_count32 BITCOIN_HFI_INIT =
   { "Input Count", "bitcoin.tx.input_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_tx_in_count64 BITCOIN_HFI_INIT =
-  { "Input Count", "bitcoin.tx.input_count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Input Count", "bitcoin.tx.input_count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_bitcoin_msg_tx BITCOIN_HFI_INIT =
   { "Tx message", "bitcoin.tx", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -312,7 +312,7 @@ static header_field_info hfi_msg_tx_in_script32 BITCOIN_HFI_INIT =
   { "Script Length", "bitcoin.tx.in.script_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_tx_in_script64 BITCOIN_HFI_INIT =
-  { "Script Length", "bitcoin.tx.in.script_length", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Script Length", "bitcoin.tx.in.script_length64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_tx_in BITCOIN_HFI_INIT =
   { "Transaction input", "bitcoin.tx.in", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -342,7 +342,7 @@ static header_field_info hfi_msg_tx_out_count32 BITCOIN_HFI_INIT =
   { "Output Count", "bitcoin.tx.output_count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_tx_out_count64 BITCOIN_HFI_INIT =
-  { "Output Count", "bitcoin.tx.output_count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Output Count", "bitcoin.tx.output_count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_tx_out BITCOIN_HFI_INIT =
   { "Transaction output", "bitcoin.tx.out", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -360,7 +360,7 @@ static header_field_info hfi_msg_tx_out_script32 BITCOIN_HFI_INIT =
   { "Script Length", "bitcoin.tx.out.script_length", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_tx_out_script64 BITCOIN_HFI_INIT =
-  { "Script Length", "bitcoin.tx.out.script_length", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Script Length", "bitcoin.tx.out.script_length64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_tx_out_script BITCOIN_HFI_INIT =
   { "Script", "bitcoin.tx.out.script", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -379,7 +379,7 @@ static header_field_info hfi_msg_block_transactions32 BITCOIN_HFI_INIT =
   { "Number of transactions", "bitcoin.block.num_transactions", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_block_transactions64 BITCOIN_HFI_INIT =
-  { "Number of transactions", "bitcoin.block.num_transactions", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Number of transactions", "bitcoin.block.num_transactions64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_bitcoin_msg_block BITCOIN_HFI_INIT =
   { "Block message", "bitcoin.block", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -434,7 +434,7 @@ static header_field_info hfi_msg_headers_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.headers.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_headers_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.headers.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.headers.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 /* ping message */
 static header_field_info hfi_bitcoin_msg_ping BITCOIN_HFI_INIT =
@@ -524,7 +524,7 @@ static header_field_info hfi_msg_merkleblock_hashes_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.merkleblock.hashes.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_merkleblock_hashes_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.merkleblock.hashes.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.merkleblock.hashes.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_merkleblock_hashes_hash BITCOIN_HFI_INIT =
   { "Hash", "bitcoin.merkleblock.hashes.hash", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -539,7 +539,7 @@ static header_field_info hfi_msg_merkleblock_flags_size32 BITCOIN_HFI_INIT =
   { "Size", "bitcoin.merkleblock.flags.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_merkleblock_flags_size64 BITCOIN_HFI_INIT =
-  { "Size", "bitcoin.merkleblock.flags.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Size", "bitcoin.merkleblock.flags.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_msg_merkleblock_flags_data BITCOIN_HFI_INIT =
   { "Data", "bitcoin.merkleblock.flags.data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL };
@@ -572,7 +572,7 @@ static header_field_info hfi_string_varint_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.string.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_string_varint_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.string.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.string.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 /* variable data */
 static header_field_info hfi_data_value BITCOIN_HFI_INIT =
@@ -588,7 +588,7 @@ static header_field_info hfi_data_varint_count32 BITCOIN_HFI_INIT =
   { "Count", "bitcoin.data.count", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 static header_field_info hfi_data_varint_count64 BITCOIN_HFI_INIT =
-  { "Count", "bitcoin.data.count", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
+  { "Count", "bitcoin.data.count64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL };
 
 
 static gint ett_bitcoin = -1;
diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index ea69264ae4..c116ef6e1c 100644
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -6512,7 +6512,7 @@ proto_register_dcerpc(void)
           { "Referent ID", "dcerpc.referent_id", FT_UINT32, BASE_HEX,
             NULL, 0, "Referent ID for this NDR encoded pointer", HFILL }},
         { &hf_dcerpc_referent_id64,
-          { "Referent ID", "dcerpc.referent_id", FT_UINT64, BASE_HEX,
+          { "Referent ID", "dcerpc.referent_id64", FT_UINT64, BASE_HEX,
             NULL, 0, "Referent ID for this NDR encoded pointer", HFILL }},
         { &hf_dcerpc_ver,
           { "Version", "dcerpc.ver", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
@@ -6914,7 +6914,7 @@ proto_register_dcerpc(void)
     };
 
     static ei_register_info ei[] = {
-        { &ei_dcerpc_fragment, { "dcerpc.fragment", PI_REASSEMBLE, PI_CHAT, "%s fragment", EXPFILL }},
+        { &ei_dcerpc_fragment, { "dcerpc.fragment.reassemble", PI_REASSEMBLE, PI_CHAT, "%s fragment", EXPFILL }},
         { &ei_dcerpc_fragment_reassembled, { "dcerpc.fragment_reassembled", PI_REASSEMBLE, PI_CHAT, "%s fragment, reassembled", EXPFILL }},
         { &ei_dcerpc_cn_ctx_id_no_bind, { "dcerpc.cn_ctx_id.no_bind", PI_UNDECODED, PI_NOTE, "No bind info for interface Context ID %u - capture start too late?", EXPFILL }},
         { &ei_dcerpc_no_request_found, { "dcerpc.no_request_found", PI_SEQUENCE, PI_NOTE, "No request to this DCE/RPC call found", EXPFILL }},
diff --git a/epan/dissectors/packet-dmp.c b/epan/dissectors/packet-dmp.c
index 373ac98bd7..83d16a8dc2 100644
--- a/epan/dissectors/packet-dmp.c
+++ b/epan/dissectors/packet-dmp.c
@@ -4379,7 +4379,7 @@ void proto_register_dmp (void)
       { "Recipient Number (bits 14-7)", "dmp.rec_no_offset2", FT_UINT8,
         BASE_DEC, NULL, 0xFF, "Recipient Number (bits 14-7) Offset", HFILL } },
     { &hf_addr_ext_address,
-      { "Extended Address", "dmp.addr_form", FT_NONE, BASE_NONE,
+      { "Extended Address", "dmp.addr_form_ext", FT_NONE, BASE_NONE,
         NULL, 0x0, NULL, HFILL } },
     { &hf_addr_ext_type,
       { "Address Type", "dmp.addr_type", FT_UINT8, BASE_DEC,
@@ -4630,13 +4630,13 @@ void proto_register_dmp (void)
       { "Structured Id", "dmp.body.id", FT_UINT32, BASE_DEC,
         NULL, 0x0, "Structured Body Id (4 bytes)", HFILL } },
     { &hf_message_bodyid_uint64,
-      { "Structured Id", "dmp.body.id", FT_UINT64, BASE_DEC,
+      { "Structured Id", "dmp.body.id64", FT_UINT64, BASE_DEC,
         NULL, 0x0, "Structured Body Id (8 bytes)", HFILL } },
     { &hf_message_bodyid_string,
-      { "Structured Id", "dmp.body.id", FT_STRING, BASE_NONE,
+      { "Structured Id", "dmp.body.idstring", FT_STRING, BASE_NONE,
         NULL, 0x0, "Structured Body Id (fixed text string)", HFILL } },
     { &hf_message_bodyid_zstring,
-      { "Structured Id", "dmp.body.id", FT_STRINGZ, BASE_NONE,
+      { "Structured Id", "dmp.body.idstring", FT_STRINGZ, BASE_NONE,
         NULL, 0x0, "Structured Body Id (zero terminated text string)",
         HFILL } },
     { &hf_message_body_structured,
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c
index 4bb3aec41b..eeed2a6613 100644
--- a/epan/dissectors/packet-edonkey.c
+++ b/epan/dissectors/packet-edonkey.c
@@ -3324,9 +3324,9 @@ void proto_register_edonkey(void) {
       { &hf_emule_signature_length, { "Signature length", "edonkey.emule.signature_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_edonkey_obfuscation_settings, { "Obfuscation Settings", "edonkey.obfuscation_settings", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_edonkey_start_offset, { "Start Offset", "edonkey.start_offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-      { &hf_edonkey_start_offset_64, { "Start Offset", "edonkey.start_offset", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+      { &hf_edonkey_start_offset_64, { "Start Offset", "edonkey.start_offset64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_edonkey_end_offset, { "End Offset", "edonkey.end_offset", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-      { &hf_edonkey_end_offset_64, { "End Offset", "edonkey.end_offset", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+      { &hf_edonkey_end_offset_64, { "End Offset", "edonkey.end_offset64", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_edonkey_emule_file_length, { "File Length", "edonkey.emule.file_length", FT_UINT64, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_edonkey_overnet_peer_type, { "Peer Type", "edonkey.overnet_peer_type", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
       { &hf_edonkey_more_search_file_results, { "More", "edonkey.more_search_file_results", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x0, NULL, HFILL }},
diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c
index f4811346fc..385b8bab88 100644
--- a/epan/dissectors/packet-h248.c
+++ b/epan/dissectors/packet-h248.c
@@ -5493,7 +5493,7 @@ void proto_register_h248(void) {
             FT_STRING, BASE_NONE, NULL, 0,
             "h248.IA5String", HFILL }},
         { &hf_h248_context_id64,
-          { "contextId", "h248.contextId",
+          { "contextId", "h248.contextId64",
             FT_UINT64, BASE_HEX, NULL, 0,
             "Context ID", HFILL }},
         { &hf_h248_transactionId64,
diff --git a/epan/dissectors/packet-hcrt.c b/epan/dissectors/packet-hcrt.c
index 1ee5607133..718f236360 100644
--- a/epan/dissectors/packet-hcrt.c
+++ b/epan/dissectors/packet-hcrt.c
@@ -437,7 +437,7 @@ void proto_register_hcrt(void)
             NULL, HFILL }
         },
         { &hf_hcrt_data_64,
-            { "Data", "hcrt.data32",
+            { "Data", "hcrt.data64",
             FT_UINT64, BASE_HEX,
             NULL, 0x0,
             NULL, HFILL }
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c
index 43123960d7..d152380cec 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -21432,7 +21432,7 @@ proto_register_ieee80211 (void)
       NULL, HFILL }},
 
     {&hf_ieee80211_ff_psmp_sta_info_reserved_large,
-     {"Reserved", "wlan_mgt.fixed.psmp.stainfo.reserved",
+     {"Reserved", "wlan_mgt.fixed.psmp.stainfo.reserved64",
       FT_UINT64, BASE_HEX, 0, 0,
       NULL, HFILL }},
 
diff --git a/epan/dissectors/packet-isakmp.c b/epan/dissectors/packet-isakmp.c
index 1158673a85..6cfd973e2b 100644
--- a/epan/dissectors/packet-isakmp.c
+++ b/epan/dissectors/packet-isakmp.c
@@ -6053,11 +6053,11 @@ proto_register_isakmp(void)
         FT_UINT32, BASE_DEC, NULL, 0x00,
         NULL, HFILL }},
     { &hf_isakmp_tf_attr_life_duration_uint64,
-      { "Life Duration", "isakmp.tf.attr.life_duration",
+      { "Life Duration", "isakmp.tf.attr.life_duration64",
         FT_UINT64, BASE_DEC, NULL, 0x00,
         NULL, HFILL }},
     { &hf_isakmp_tf_attr_life_duration_bytes,
-      { "Life Duration", "isakmp.tf.attr.life_duration",
+      { "Life Duration", "isakmp.tf.attr.life_duration_bytes",
         FT_BYTES, BASE_NONE, NULL, 0x00,
         NULL, HFILL }},
     { &hf_isakmp_tf_attr_group_description,
@@ -6183,11 +6183,11 @@ proto_register_isakmp(void)
         FT_UINT32, BASE_DEC, NULL, 0x00,
         NULL, HFILL }},
     { &hf_isakmp_ike_attr_life_duration_uint64,
-      { "Life Duration", "isakmp.ike.attr.life_duration",
+      { "Life Duration", "isakmp.ike.attr.life_duration64",
         FT_UINT64, BASE_DEC, NULL, 0x00,
         NULL, HFILL }},
     { &hf_isakmp_ike_attr_life_duration_bytes,
-      { "Life Duration", "isakmp.ike.attr.life_duration",
+      { "Life Duration", "isakmp.ike.attr.life_duration_bytes",
         FT_BYTES, BASE_NONE, NULL, 0x00,
         NULL, HFILL }},
     { &hf_isakmp_ike_attr_prf,
diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c
index fb98d01d77..454c7a66d4 100644
--- a/epan/dissectors/packet-jxta.c
+++ b/epan/dissectors/packet-jxta.c
@@ -2339,7 +2339,7 @@ void proto_register_jxta(void)
           "JXTA Message Element Content Length", HFILL}
          },
         {&hf_jxta_element_content_len64,
-         {"Element Content Length", "jxta.message.element.content.length", FT_UINT64, BASE_DEC, NULL, 0x0,
+         {"Element Content Length", "jxta.message.element.content.length64", FT_UINT64, BASE_DEC, NULL, 0x0,
           "JXTA Message Element Content Length", HFILL}
          },
 #if 0
diff --git a/epan/dissectors/packet-rmt-lct.c b/epan/dissectors/packet-rmt-lct.c
index 0b8efd19af..945b8c2814 100644
--- a/epan/dissectors/packet-rmt-lct.c
+++ b/epan/dissectors/packet-rmt-lct.c
@@ -571,7 +571,7 @@ proto_register_rmt_lct(void)
             NULL, HFILL }
         },
         { &hf_tsi48,
-          { "Transport Session Identifier", "rmt-lct.tsi",
+          { "Transport Session Identifier", "rmt-lct.tsi64",
             FT_UINT64, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
@@ -591,12 +591,12 @@ proto_register_rmt_lct(void)
             NULL, HFILL }
         },
         { &hf_toi48,
-          { "Transport Object Identifier", "rmt-lct.toi",
+          { "Transport Object Identifier", "rmt-lct.toi64",
             FT_UINT64, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
         { &hf_toi64,
-          { "Transport Object Identifier (up to 64 bits)", "rmt-lct.toi",
+          { "Transport Object Identifier (up to 64 bits)", "rmt-lct.toi64",
             FT_UINT64, BASE_DEC, NULL, 0x0,
             NULL, HFILL }
         },
diff --git a/epan/dissectors/packet-smb.c b/epan/dissectors/packet-smb.c
index 47f13e71b6..4f84e5c2f0 100644
--- a/epan/dissectors/packet-smb.c
+++ b/epan/dissectors/packet-smb.c
@@ -18962,7 +18962,7 @@ proto_register_smb(void)
 		NULL, 0, "Open is relative to this FID (if nonzero)", HFILL }},
 
 	{ &hf_smb_alloc_size64,
-		{ "Allocation Size", "smb.alloc_size", FT_UINT64, BASE_DEC,
+		{ "Allocation Size", "smb.alloc_size64", FT_UINT64, BASE_DEC,
 		NULL, 0, "Number of bytes to reserve on create or truncate", HFILL }},
 
 	{ &hf_smb_nt_create_disposition,
diff --git a/epan/dissectors/packet-trmac.c b/epan/dissectors/packet-trmac.c
index b4cbb954f4..4e613630c9 100644
--- a/epan/dissectors/packet-trmac.c
+++ b/epan/dissectors/packet-trmac.c
@@ -664,7 +664,7 @@ proto_register_trmac(void)
 
 		/* Generated from convert_proto_tree_add_text.pl */
 		{ &hf_trmac_response_code32, { "Response Code", "trmac.response_code", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
-		{ &hf_trmac_response_code48, { "Response Code", "trmac.response_code", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+		{ &hf_trmac_response_code48, { "Response Code", "trmac.response_code48", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_trmac_product_instance_id, { "Product Instance ID", "trmac.product_instance_id", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_trmac_ring_station_version_number, { "Ring Station Version Number", "trmac.ring_station_version_number", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_trmac_wrap_data, { "Wrap Data", "trmac.wrap_data", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},