Change a couple of hf abbreviations so they're not the name of the hf variable.

Use . as the separator (after PROTOABBREV) in the hf abbreviations.

svn path=/trunk/; revision=34397

5 files changed, 99 insertions, 99 deletions

diff --git a/epan/dissectors/packet-dcom-dispatch.c b/epan/dissectors/packet-dcom-dispatch.c
index d858d98177..8bb106051e 100644
--- a/epan/dissectors/packet-dcom-dispatch.c
+++ b/epan/dissectors/packet-dcom-dispatch.c
@@ -542,71 +542,71 @@ proto_register_dcom_dispatch(void)
           { "Operation", "dispatch_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dispatch_riid,
-          { "RIID", "dispatch_riid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "RIID", "dispatch.riid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_name,
-          { "Name", "hf_dispatch_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "Name", "dispatch.name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_names,
-          { "Names", "dispatch_names", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "Names", "dispatch.names", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_lcid,
-          { "LCID", "dispatch_lcid", FT_UINT32, BASE_HEX, VALS(dcom_lcid_vals), 0x0, NULL, HFILL }},
+          { "LCID", "dispatch.lcid", FT_UINT32, BASE_HEX, VALS(dcom_lcid_vals), 0x0, NULL, HFILL }},
         { &hf_dispatch_id,
-          { "DispID", "dispatch_id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          { "DispID", "dispatch.id", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_flags,
-          { "Flags", "dispatch_flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          { "Flags", "dispatch.flags", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dispatch_arg,
-          { "Argument", "dispatch_arg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "Argument", "dispatch.arg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_args,
-          { "Args", "dispatch_args", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "Args", "dispatch.args", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_named_args,
-          { "NamedArgs", "dispatch_named_args", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "NamedArgs", "dispatch.named_args", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_varref,
-          { "VarRef", "dispatch_varref", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "VarRef", "dispatch.varref", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_varrefidx,
-          { "VarRefIdx", "dispatch_varrefidx", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "VarRefIdx", "dispatch.varrefidx", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_varrefarg,
-          { "VarRef", "dispatch_varrefarg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "VarRef", "dispatch.varrefarg", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_varresult,
-          { "VarResult", "dispatch_varresult", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "VarResult", "dispatch.varresult", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dispatch_flags_method,
-          { "Method", "dispatch_flags_method", FT_BOOLEAN, 32, TFS (&tfs_set_notset), DISPATCH_FLAGS_METHOD, NULL, HFILL }},
+          { "Method", "dispatch.flags_method", FT_BOOLEAN, 32, TFS (&tfs_set_notset), DISPATCH_FLAGS_METHOD, NULL, HFILL }},
         { &hf_dispatch_flags_propget,
-          { "PropertyGet", "dispatch_flags_propget", FT_BOOLEAN, 32, TFS (&tfs_set_notset), DISPATCH_FLAGS_PROPGET, NULL, HFILL }},
+          { "PropertyGet", "dispatch.flags_propget", FT_BOOLEAN, 32, TFS (&tfs_set_notset), DISPATCH_FLAGS_PROPGET, NULL, HFILL }},
         { &hf_dispatch_flags_propput,
-          { "PropertyPut", "dispatch_flags_propput", FT_BOOLEAN, 32, TFS (&tfs_set_notset), DISPATCH_FLAGS_PROPPUT, NULL, HFILL }},
+          { "PropertyPut", "dispatch.flags_propput", FT_BOOLEAN, 32, TFS (&tfs_set_notset), DISPATCH_FLAGS_PROPPUT, NULL, HFILL }},
         { &hf_dispatch_flags_propputref,
-          { "PropertyPutRef", "dispatch_flags_propputref", FT_BOOLEAN, 32, TFS (&tfs_set_notset), DISPATCH_FLAGS_PROPPUTREF, NULL, HFILL }},
+          { "PropertyPutRef", "dispatch.flags_propputref", FT_BOOLEAN, 32, TFS (&tfs_set_notset), DISPATCH_FLAGS_PROPPUTREF, NULL, HFILL }},
 
         { &hf_dispatch_code,
-          { "Code", "dispatch_code", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          { "Code", "dispatch.code", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_reserved16,
-          { "Reserved", "dispatch_reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          { "Reserved", "dispatch.reserved16", FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_source,
-          { "Source", "dispatch_source", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "Source", "dispatch.source", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_description,
-          { "Description", "dispatch_description", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "Description", "dispatch.description", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_help_file,
-          { "HelpFile", "dispatch_help_file", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "HelpFile", "dispatch.help_file", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_help_context,
-          { "HelpContext", "dispatch_help_context", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          { "HelpContext", "dispatch.help_context", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_reserved32,
-          { "Reserved", "dispatch_reserved32", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          { "Reserved", "dispatch.reserved32", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_deferred_fill_in,
-          { "DeferredFillIn", "dispatch_deferred_fill_in", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          { "DeferredFillIn", "dispatch.deferred_fill_in", FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_arg_err,
-          { "ArgErr", "dispatch_arg_err", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "ArgErr", "dispatch.arg_err", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_dispatch_tinfo,
-          { "TInfo", "dispatch_tinfo", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "TInfo", "dispatch.tinfo", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_itinfo,
-          { "TInfo", "dispatch_itinfo", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "TInfo", "dispatch.itinfo", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_dispparams,
-          { "DispParams", "dispatch_dispparams", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "DispParams", "dispatch.dispparams", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_excepinfo,
-          { "ExcepInfo", "dispatch_excepinfo", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "ExcepInfo", "dispatch.excepinfo", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_dispatch_scode,
-          { "SCode", "dispatch_scode", FT_UINT32, BASE_HEX, VALS(dcom_hresult_vals), 0x0, NULL, HFILL }}
+          { "SCode", "dispatch.scode", FT_UINT32, BASE_HEX, VALS(dcom_hresult_vals), 0x0, NULL, HFILL }}
     };
 
     static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcom-oxid.c b/epan/dissectors/packet-dcom-oxid.c
index 6d1fc479a5..4503b5948a 100644
--- a/epan/dissectors/packet-dcom-oxid.c
+++ b/epan/dissectors/packet-dcom-oxid.c
@@ -65,7 +65,7 @@ static int
 dissect_oxid_simple_ping_rqst(tvbuff_t *tvb, int offset,
 	packet_info *pinfo, proto_tree *tree, guint8 *drep)
 {
-	offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep,
 						hf_oxid_setid, NULL);
 
 	return offset;
@@ -79,11 +79,11 @@ dissect_oxid_simple_ping_resp(tvbuff_t *tvb, int offset,
 	guint32 u32HResult;
 
 
-	offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep,
 						&u32HResult);
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-	  col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", 
+	  col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s",
 		val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") );
 	}
 
@@ -98,11 +98,11 @@ dissect_oxid_server_alive_resp(tvbuff_t *tvb, int offset,
 	guint32 u32HResult;
 
 
-	offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep,
 						&u32HResult);
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-	  col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", 
+	  col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s",
 		val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") );
 	}
 
@@ -120,29 +120,29 @@ dissect_oxid_complex_ping_rqst(tvbuff_t *tvb, int offset,
 	guint32	u32Pointer;
 	guint32	u32ArraySize;
 
-	offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep,
 						hf_oxid_setid, NULL);
 
-	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep,
 						hf_oxid_seqnum, &u16SeqNum);
-	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep,
 						hf_oxid_addtoset, &u16AddToSet);
-	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep,
 						hf_oxid_delfromset, &u16DelFromSet);
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-		col_append_fstr(pinfo->cinfo, COL_INFO, " AddToSet=%u DelFromSet=%u", 
+		col_append_fstr(pinfo->cinfo, COL_INFO, " AddToSet=%u DelFromSet=%u",
 			u16AddToSet, u16DelFromSet);
 	}
 
 	offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep,
 						&u32Pointer);
 	if (u32Pointer) {
-		offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, 
+		offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep,
 							&u32ArraySize);
 
 		while (u16AddToSet--) {
-			offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep, 
+			offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep,
 							hf_oxid_oid, NULL);
 		}
 	}
@@ -150,11 +150,11 @@ dissect_oxid_complex_ping_rqst(tvbuff_t *tvb, int offset,
 	offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep,
 						&u32Pointer);
     if (u32Pointer) {
-		offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, 
+		offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep,
 							&u32ArraySize);
 
 		while (u16DelFromSet--) {
-			offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep, 
+			offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep,
 							hf_oxid_oid, NULL);
 		}
 	}
@@ -171,16 +171,16 @@ dissect_oxid_complex_ping_resp(tvbuff_t *tvb, int offset,
 	guint32 u32HResult;
 
 
-	offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep,
 						hf_oxid_setid, NULL);
 	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep,
 						hf_oxid_ping_backoff_factor, &u16PingBackoffFactor);
 
-	offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep,
 						&u32HResult);
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-	  col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", 
+	  col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s",
 		val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") );
 	}
 
@@ -197,18 +197,18 @@ dissect_oxid_resolve_oxid2_rqst(tvbuff_t *tvb, int offset,
 	guint32	u32ItemIdx;
 
 
-	offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_ID(tvb, offset, pinfo, tree, drep,
 						hf_oxid_oxid, NULL);
 
-	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep,
                         hf_oxid_requested_protseqs, &u16ProtSeqs);
 
-	offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep,
 						&u32ArraySize);
 
 	u32ItemIdx = 1;
 	while (u32ArraySize--) {
-		offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep, 
+		offset = dissect_dcom_WORD(tvb, offset, pinfo, tree, drep,
 							hf_oxid_protseqs, &u16ProtSeqs);
 		u32ItemIdx++;
 	}
@@ -230,30 +230,30 @@ dissect_oxid_resolve_oxid2_resp(tvbuff_t *tvb, int offset,
 	guint32	u32HResult;
 
 
-	offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_dcerpc_pointer(tvb, offset, pinfo, tree, drep,
 						&u32Pointer);
 	if (u32Pointer) {
-		offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep, 
+		offset = dissect_dcom_dcerpc_array_size(tvb, offset, pinfo, tree, drep,
 							&u32ArraySize);
 
-		offset = dissect_dcom_DUALSTRINGARRAY(tvb, offset, pinfo, tree, drep, 
+		offset = dissect_dcom_DUALSTRINGARRAY(tvb, offset, pinfo, tree, drep,
 							hf_oxid_bindings, NULL);
-		
-		offset = dissect_dcom_UUID(tvb, offset, pinfo, tree, drep, 
+
+		offset = dissect_dcom_UUID(tvb, offset, pinfo, tree, drep,
 							hf_oxid_ipid, &ipid);
 
-		offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep, 
+		offset = dissect_dcom_DWORD(tvb, offset, pinfo, tree, drep,
 							hf_oxid_authn_hint, &u32AuthnHint);
 
 		offset = dissect_dcom_COMVERSION(tvb, offset, pinfo, tree, drep,
 					&u16VersionMajor, &u16VersionMinor);
 	}
 
-	offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep, 
+	offset = dissect_dcom_HRESULT(tvb, offset, pinfo, tree, drep,
 						&u32HResult);
 
 	if (check_col(pinfo->cinfo, COL_INFO)) {
-	  col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s", 
+	  col_append_fstr(pinfo->cinfo, COL_INFO, " -> %s",
 		val_to_str(u32HResult, dcom_hresult_vals, "Unknown (0x%08x)") );
 	}
 
@@ -262,7 +262,7 @@ dissect_oxid_resolve_oxid2_resp(tvbuff_t *tvb, int offset,
 
 
 static int
-dissect_oxid_server_alive2_resp(tvbuff_t *tvb, int offset, packet_info *pinfo, 
+dissect_oxid_server_alive2_resp(tvbuff_t *tvb, int offset, packet_info *pinfo,
 				proto_tree *tree, guint8 *drep) {
     guint16	u16VersionMajor;
     guint16 u16VersionMinor;
@@ -302,38 +302,38 @@ proto_register_oxid (void)
 		  { "Operation", "oxid.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_oxid_setid,
-		{ "SetId", "oxid_setid",  FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+		  { "SetId", "oxid.setid",  FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_seqnum,
-		{ "SeqNum", "oxid_seqnum",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "SeqNum", "oxid.seqnum",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_addtoset,
-		{ "AddToSet", "oxid_addtoset",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "AddToSet", "oxid.addtoset",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_delfromset,
-		{ "DelFromSet", "oxid_delfromset",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "DelFromSet", "oxid.delfromset",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_oid,
-		{ "OID", "oxid_oid",  FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+		  { "OID", "oxid.oid",  FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_ping_backoff_factor,
-		{ "PingBackoffFactor", "oxid_ping_backoff_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "PingBackoffFactor", "oxid.ping_backoff_factor", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_oxid,
-		{ "OXID", "oxid_oxid",  FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+		  { "OXID", "oxid.oxid", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_oxid_requested_protseqs,
-		{ "RequestedProtSeq", "oxid_requested_protseqs",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "RequestedProtSeq", "oxid.requested_protseqs",  FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_protseqs,
-		{ "ProtSeq", "oxid_protseqs",  FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }},
+		  { "ProtSeq", "oxid.protseqs",  FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }},
 
 		{ &hf_oxid_bindings,
-		{ "OxidBindings", "oxid_bindings", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-        { &hf_oxid_ipid,
-        { "IPID", "oxid_ipid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+		  { "OxidBindings", "oxid.bindings", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+		{ &hf_oxid_ipid,
+		  { "IPID", "oxid.ipid", FT_GUID, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_authn_hint,
-		{ "AuthnHint", "oxid_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "AuthnHint", "oxid.authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_oxid_ds_array,
 		  { "Address", "dcom.oxid.address", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_Unknown1,
-		  { "unknown 8 bytes 1", "oxid5.unknown1", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+		  { "unknown 8 bytes 1", "oxid.unknown1", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }},
 		{ &hf_oxid_Unknown2,
-                  { "unknown 8 bytes 2", "oxid5.unknown2", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}
+                  { "unknown 8 bytes 2", "oxid.unknown2", FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL }}
 	};
 	static gint *ett[] = {
 		&ett_oxid
diff --git a/epan/dissectors/packet-dcom-remact.c b/epan/dissectors/packet-dcom-remact.c
index ca7d393162..0eb7552bd1 100644
--- a/epan/dissectors/packet-dcom-remact.c
+++ b/epan/dissectors/packet-dcom-remact.c
@@ -215,29 +215,29 @@ proto_register_remact (void)
 {
 	static hf_register_info hf_remact[] = {
 		{ &hf_remact_opnum,
-		  { "Operation", "remact_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "Operation", "remact.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_remact_requested_protseqs,
-		  { "RequestedProtSeqs", "remact_req_prot_seqs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "RequestedProtSeqs", "remact.req_prot_seqs", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_protseqs,
-		  { "ProtSeqs", "remact_prot_seqs", FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }},
+		  { "ProtSeqs", "remact.prot_seqs", FT_UINT16, BASE_DEC, VALS(dcom_protseq_vals), 0x0, NULL, HFILL }},
 		{ &hf_remact_interfaces,
-		  { "Interfaces", "remact_interfaces", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "Interfaces", "remact.interfaces", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_mode,
-		  { "Mode", "remact_mode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "Mode", "remact.mode", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_client_impl_level,
-		  { "ClientImplLevel", "remact_client_impl_level", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "ClientImplLevel", "remact.client_impl_level", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_object_name,
-		  { "ObjectName", "remact_object_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+		  { "ObjectName", "remact.object_name", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_object_storage,
-		  { "ObjectStorage", "remact_object_storage", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+		  { "ObjectStorage", "remact.object_storage", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_interface_data,
-		  { "InterfaceData", "remact_interface_data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+		  { "InterfaceData", "remact.interface_data", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 
 		{ &hf_remact_oxid_bindings,
-		  { "OxidBindings", "hf_remact_oxid_bindings", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+		  { "OxidBindings", "remact.oxid_bindings", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
 		{ &hf_remact_authn_hint,
-		  { "AuthnHint", "remact_authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+		  { "AuthnHint", "remact.authn_hint", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 	};
 
 	static gint *ett[] = {
diff --git a/epan/dissectors/packet-dcom-remunkn.c b/epan/dissectors/packet-dcom-remunkn.c
index 24640ad082..1f362fb18c 100644
--- a/epan/dissectors/packet-dcom-remunkn.c
+++ b/epan/dissectors/packet-dcom-remunkn.c
@@ -331,24 +331,24 @@ proto_register_remunk (void)
 {
     static hf_register_info hf_remunk_rqi_array[] = {
         { &hf_remunk_opnum,
-          { "Operation", "remunk_opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "Operation", "remunk.opnum", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
 
         { &hf_remunk_refs,
-          { "Refs", "remunk_refs", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "Refs", "remunk.refs", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_remunk_iids,
-          { "IIDs", "remunk_iids", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "IIDs", "remunk.iids", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_remunk_qiresult,
-          { "QIResult", "remunk_qiresult", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "QIResult", "remunk.qiresult", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_remunk_flags,
-          { "Flags", "remunk_flags",  FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
+          { "Flags", "remunk.flags",  FT_UINT32, BASE_HEX, NULL, 0x0, NULL, HFILL }},
         { &hf_remunk_public_refs,
-          { "PublicRefs", "remunk_public_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "PublicRefs", "remunk.public_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_remunk_reminterfaceref,
-          { "RemInterfaceRef", "remunk_reminterfaceref",  FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+          { "RemInterfaceRef", "remunk.reminterfaceref",  FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
         { &hf_remunk_interface_refs,
-          { "InterfaceRefs", "remunk_int_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+          { "InterfaceRefs", "remunk.int_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
         { &hf_remunk_private_refs,
-          { "PrivateRefs", "remunk_private_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}
+          { "PrivateRefs", "remunk.private_refs",  FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}
     };
 
     static gint *ett_remunk_array[] = {
diff --git a/epan/dissectors/packet-tn3270.c b/epan/dissectors/packet-tn3270.c
index 33c2897ef2..c2c375968b 100644
--- a/epan/dissectors/packet-tn3270.c
+++ b/epan/dissectors/packet-tn3270.c
@@ -5232,7 +5232,7 @@ proto_register_tn3270(void)
         FT_UINT8, BASE_HEX, NULL, 0x0,
         NULL, HFILL }},
     { &hf_tn3270_aid,
-      { "Attention Identification", "hf_tn3270_aid",
+      { "Attention Identification", "tn3270.aid",
         FT_UINT8, BASE_HEX, VALS(vals_attention_identification_bytes), 0x0,
         NULL, HFILL }},
 
@@ -5285,7 +5285,7 @@ proto_register_tn3270(void)
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }},
     { &hf_tn3270_partition_rv,
-        {  "The y, or row, origin of the viewport relative to the top edge of the usable area", "hf_tn3270_partition_rv",
+        {  "The y, or row, origin of the viewport relative to the top edge of the usable area", "tn3270.partition_rv",
             FT_UINT16, BASE_DEC, NULL, 0x0,
             NULL, HFILL }},
     { &hf_tn3270_partition_cv,
@@ -5326,7 +5326,7 @@ proto_register_tn3270(void)
             NULL, HFILL }},
 
     { &hf_tn3270_partition_command,
-        {  "Partition Command", "hf_tn3270_partition_command",
+        {  "Partition Command", "tn3270.partition_command",
             FT_UINT8, BASE_HEX, VALS(vals_command_codes), 0x0,
             NULL, HFILL }},
     /* End - 5.7 - Create Partition */