Fix duplicated filter names.

21 files changed, 221 insertions, 190 deletions

diff --git a/epan/dissectors/asn1/camel/camel.cnf b/epan/dissectors/asn1/camel/camel.cnf
index 2f782f0961..a1b4dea7ed 100644
--- a/epan/dissectors/asn1/camel/camel.cnf
+++ b/epan/dissectors/asn1/camel/camel.cnf
@@ -71,7 +71,7 @@ InbandInfo/duration			inbandInfoDuration
 Tone/duration				toneDuration
 Burst/toneDuration			burstToneDuration
 
-EventSpecificInformationSMS/o-smsFailureSpecificInfo/failureCause smsfailureCause
+EventSpecificInformationSMS/o-smsFailureSpecificInfo/failureCause mo-smsfailureCause
 EventSpecificInformationBCSM/routeSelectFailureSpecificInfo/failureCause routeSelectfailureCause
 EventSpecificInformationSMS/t-smsFailureSpecificInfo/failureCause t-smsfailureCause
 
@@ -766,4 +766,9 @@ Code/local TYPE = FT_INT32  DISPLAY = BASE_DEC  STRINGS = VALS(camel_opr_code_st
 ServiceInteractionIndicatorsTwo/holdTreatmentIndicator TYPE = FT_INT32  DISPLAY = BASE_DEC STRINGS = VALS(camel_holdTreatmentIndicator_values)
 ServiceInteractionIndicatorsTwo/cwTreatmentIndicator TYPE = FT_INT32  DISPLAY = BASE_DEC STRINGS = VALS(camel_cwTreatmentIndicator_values)
 ServiceInteractionIndicatorsTwo/ectTreatmentIndicator TYPE = FT_INT32  DISPLAY = BASE_DEC STRINGS = VALS(camel_ectTreatmentIndicator_values)
+#.FIELD_ATTR
+EventSpecificInformationSMS/o-smsFailureSpecificInfo/failureCause ABBREV=mo-smsfailureCause
+EventSpecificInformationBCSM/routeSelectFailureSpecificInfo/failureCause ABBREV=routeSelectfailureCause
+EventSpecificInformationSMS/t-smsFailureSpecificInfo/failureCause ABBREV=t-smsfailureCause
+Tone/duration ABBREV=toneDuration
 #.END
diff --git a/epan/dissectors/asn1/cmip/cmip.cnf b/epan/dissectors/asn1/cmip/cmip.cnf
index ba8681336f..0b5475797d 100644
--- a/epan/dissectors/asn1/cmip/cmip.cnf
+++ b/epan/dissectors/asn1/cmip/cmip.cnf
@@ -499,5 +499,9 @@ RejectProblem
 #.FN_BODY SupportedFeatures/_item/featureInfo
   offset=call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree, actx->private_data);
 
+#.FIELD_ATTR
+Attribute/id ABBREV=attributeid
+FilterItem/present ABBREV=filterItempresent
+Invoke/linkedId/present ABBREV=linkedIdPresent
 
 #.END
diff --git a/epan/dissectors/asn1/cmip/packet-cmip-template.c b/epan/dissectors/asn1/cmip/packet-cmip-template.c
index a48546bf0b..dbac6c6b54 100644
--- a/epan/dissectors/asn1/cmip/packet-cmip-template.c
+++ b/epan/dissectors/asn1/cmip/packet-cmip-template.c
@@ -38,10 +38,7 @@ static int hf_cmip_actionType_OID = -1;
 static int hf_cmip_eventType_OID = -1;
 static int hf_cmip_attributeId_OID = -1;
 static int hf_cmip_errorId_OID = -1;
-static int hf_DiscriminatorConstruct = -1;
-static int hf_Destination = -1;
-static int hf_NameBinding = -1;
-static int hf_ObjectClass = -1;
+
 #include "packet-cmip-hf.c"
 
 /* Initialize the subtree pointers */
@@ -143,22 +140,6 @@ void proto_register_cmip(void) {
       { "errorId", "cmip.errorId_OID",
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-   { &hf_DiscriminatorConstruct,
-      { "DiscriminatorConstruct", "cmip.DiscriminatorConstruct",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
-    { &hf_Destination,
-      { "Destination", "cmip.Destination",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
-    { &hf_NameBinding,
-      { "NameBinding", "cmip.NameBinding",
-        FT_STRING, BASE_NONE, NULL, 0,
-        NULL, HFILL }},
-    { &hf_ObjectClass,
-      { "ObjectClass", "cmip.ObjectClass",
-        FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        NULL, HFILL }},
 
 #include "packet-cmip-hfarr.c"
   };
diff --git a/epan/dissectors/asn1/cmp/cmp.cnf b/epan/dissectors/asn1/cmp/cmp.cnf
index c72f435003..05d3b5e42f 100644
--- a/epan/dissectors/asn1/cmp/cmp.cnf
+++ b/epan/dissectors/asn1/cmp/cmp.cnf
@@ -44,6 +44,10 @@ CertResponse/status     pkistatusinf
 KeyRecRepContent/status pkistatusinf
 PKIStatusInfo/status pkistatus
 RevAnnContent/status pkistatus
+#.FIELD_ATTR
+PKIStatusInfo/status    ABBREV=pkistatus
+RevRepContent/status    ABBREV=rvrpcnt_status
+
 
 #.FN_PARS InfoTypeAndValue/infoType
   FN_VARIANT = _str  HF_INDEX = hf_cmp_type_oid  VAL_PTR = &actx->external.direct_reference
diff --git a/epan/dissectors/asn1/dap/dap.cnf b/epan/dissectors/asn1/dap/dap.cnf
index d4e7a98e75..9c11b4d4a9 100644
--- a/epan/dissectors/asn1/dap/dap.cnf
+++ b/epan/dissectors/asn1/dap/dap.cnf
@@ -181,6 +181,11 @@ EntryInformationSelection/extraAttributes/select	extraSelect
 
 SaslCredentials/credentials				saslCredentials
 
+#.FIELD_ATTR
+SaslCredentials/credentials ABBREV=saslCredentials
+TokenData/time				ABBREV=utctime
+NameErrorData/matched		ABBREV=matched_name
+
 # This table creates the value_sting to name DAP operation codes and errors
 # in file packet-dap-table.c which is included in the template file
 #
@@ -362,3 +367,4 @@ OPERATION.&ResultType
 	dn = x509if_get_last_dn();
 	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s", (dn && *dn) ? dn : "(root)");
 
+
diff --git a/epan/dissectors/asn1/disp/disp.cnf b/epan/dissectors/asn1/disp/disp.cnf
index f4437b20fa..13370111e9 100644
--- a/epan/dissectors/asn1/disp/disp.cnf
+++ b/epan/dissectors/asn1/disp/disp.cnf
@@ -28,6 +28,8 @@ SubordinateChanges/changes	subordinate-changes
 ModificationParameter/secondaryShadows	modifiedSecondaryShadows
 CoordinateShadowUpdateArgumentData/updateStrategy/standard	standardUpdate
 Information/signedInformation/information	information-data
+#.FIELD_ATTR
+ModificationParameter/secondaryShadows	ABBREV=modifiedSecondaryShadows
 
 #.REGISTER
 ShadowingAgreementInfo	S dop.oid	"agreement.2.5.19.1"
diff --git a/epan/dissectors/asn1/dop/dop.cnf b/epan/dissectors/asn1/dop/dop.cnf
index e6629be715..1482f1c778 100644
--- a/epan/dissectors/asn1/dop/dop.cnf
+++ b/epan/dissectors/asn1/dop/dop.cnf
@@ -70,6 +70,10 @@ TerminateOperationalBindingArgumentData/initiator/symmetric		terminateSymmetric
 TerminateOperationalBindingArgumentData/terminateAt			terminateAtTime
 TerminateOperationalBindingResultData/terminateAt			terminateAtGeneralizedTime
 
+#.FIELD_ATTR
+TerminateOperationalBindingArgumentData/terminateAt		ABBREV=terminateAtTime
+TerminateOperationalBindingResultData/terminateAt		ABBREV=terminateAtGeneralizedTime
+
 
 #.REGISTER
 DSEType					B "2.5.12.0" "id-doa-dseType"
diff --git a/epan/dissectors/asn1/ftam/ftam.cnf b/epan/dissectors/asn1/ftam/ftam.cnf
index d473b842a5..5f538328b6 100644
--- a/epan/dissectors/asn1/ftam/ftam.cnf
+++ b/epan/dissectors/asn1/ftam/ftam.cnf
@@ -26,9 +26,9 @@ Other-Pattern
 PDU
 
 #.TYPE_RENAME
-F-OPEN-request/recovery-mode	T_request_recovery_mode
-F-OPEN-response/recovery-mode	T_response_recovery_mode
-Access-Control-Change-Attribute/actual-values	T_actual_values1
+F-OPEN-request/recovery-mode    T_request_recovery_mode
+F-OPEN-response/recovery-mode    T_response_recovery_mode
+Access-Control-Change-Attribute/actual-values    T_actual_values1
 
 Contents-Type-List/_untag/_item Contents_Type_List_item
 Charging/_untag/_item Charging_item
@@ -36,40 +36,59 @@ Diagnostic/_untag/_item Diagnostic_item
 Path-Access-Passwords/_untag/_item Path_Access_Passwords_item
 
 #.FIELD_RENAME
-F-OPEN-request/recovery-mode	request_recovery_mode
-F-OPEN-response/recovery-mode	response_recovery_mode
-Concurrency-Access/replace	replace_key
-Concurrency-Access/read-attribute	read_attribute_key
-Concurrency-Access/read		read_key
-Concurrency-Access/insert	insert_key
-Concurrency-Access/extend	extend_key
-Concurrency-Access/erase	erase_key
-Concurrency-Access/change-attribute	change_attribute_key
-Concurrency-Access/delete-Object	delete_Object_key
-F-READ-request/access-context		read_access_context
-Change-Attributes/_untag/path-access-control	change_path_access_control
-Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-identifier	attribute_extension_attribute_identifier
-F-OPEN-request/contents-type		open_contents_type
-F-READ-ATTRIB-response/attributes	read_attributes
-F-READ-LINK-ATTRIB-response/attributes	read_link_attributes
-F-SELECT-request/attributes		select_attributes
-F-SELECT-response/attributes		select_attributes
-Change-Attributes/_untag/access-control	change_attributes_access_control
-Access-Control-Change-Attribute/actual-values	actual_values1
-Account-Attribute/actual-values	actual_values2
-Access-Control-Attribute/actual-values	actual_values3
-Private-Use-Attribute/actual-values	actual_values4
-Date-and-Time-Attribute/actual-values	actual_values5
-User-Identity-Attribute/actual-values	actual_values6
-Object-Size-Attribute/actual-values	actual_values7
-Object-Availability-Attribute/actual-values	actual_values8
-Legal-Qualification-Attribute/actual-values	actual_values9
+F-OPEN-request/recovery-mode                     request_recovery_mode
+F-OPEN-response/recovery-mode                    response_recovery_mode
+Concurrency-Access/replace                       replace_key
+Concurrency-Access/read-attribute                read_attribute_key
+Concurrency-Access/read                          read_key
+Concurrency-Access/insert                        insert_key
+Concurrency-Access/extend                        extend_key
+Concurrency-Access/erase                         erase_key
+Concurrency-Access/change-attribute              change_attribute_key
+Concurrency-Access/delete-Object                 delete_Object_key
+F-READ-request/access-context                    read_access_context
+Change-Attributes/_untag/path-access-control     change_path_access_control
+Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-identifier    attribute_extension_attribute_identifier
+F-OPEN-request/contents-type                     open_contents_type
+F-READ-ATTRIB-response/attributes                read_attributes
+F-READ-LINK-ATTRIB-response/attributes           read_link_attributes
+F-SELECT-request/attributes                      select_attributes
+F-SELECT-response/attributes                     select_attributes
+Change-Attributes/_untag/access-control          change_attributes_access_control
+Access-Control-Change-Attribute/actual-values    actual_values1
+Account-Attribute/actual-values                  actual_values2
+Access-Control-Attribute/actual-values           actual_values3
+Private-Use-Attribute/actual-values              actual_values4
+Date-and-Time-Attribute/actual-values            actual_values5
+User-Identity-Attribute/actual-values            actual_values6
+Object-Size-Attribute/actual-values              actual_values7
+Object-Availability-Attribute/actual-values      actual_values8
+Legal-Qualification-Attribute/actual-values      actual_values9
+
+#.FIELD_ATTR
+Concurrency-Access/read                          ABBREV=read_key
+Concurrency-Access/insert                        ABBREV=insert_key
+Concurrency-Access/replace                       ABBREV=replace_key
+Concurrency-Access/extend                        ABBREV=extend_key
+Concurrency-Access/erase                         ABBREV=erase_key
+Concurrency-Access/read-attribute                ABBREV=read_attribute_key
+Concurrency-Access/change-attribute              ABBREV=change_attribute_key
+Concurrency-Access/delete-Object                 ABBREV=delete_Object_key
+Access-Control-Change-Attribute/actual-values    ABBREV=actual_values1
+Account-Attribute/actual-values                  ABBREV=actual_values2
+Access-Control-Attribute/actual-values           ABBREV=actual_values3
+Private-Use-Attribute/actual-values              ABBREV=actual_values4
+Date-and-Time-Attribute/actual-values            ABBREV=actual_values5
+User-Identity-Attribute/actual-values            ABBREV=actual_values6
+Object-Size-Attribute/actual-values              ABBREV=actual_values7
+Object-Availability-Attribute/actual-values      ABBREV=actual_values8
+Legal-Qualification-Attribute/actual-values      ABBREV=actual_values9
 
 #.FN_PARS Extension-Attribute/extension-attribute-identifier
-	FN_VARIANT = _str  VAL_PTR = &actx->external.direct_reference
+  FN_VARIANT = _str  VAL_PTR = &actx->external.direct_reference
 
 #.FN_PARS OBJECT_IDENTIFIER
-	FN_VARIANT = _str  VAL_PTR = &actx->external.direct_reference
+    FN_VARIANT = _str  VAL_PTR = &actx->external.direct_reference
 
 #.FN_BODY Contents-Type-Attribute/document-type/parameter
   if (actx->external.direct_reference) {
@@ -82,7 +101,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
   }
 
 #.FN_PARS Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-identifier
-	FN_VARIANT = _str  VAL_PTR = &actx->external.direct_reference
+    FN_VARIANT = _str  VAL_PTR = &actx->external.direct_reference
 
 #.FN_BODY Attribute-Extensions-Pattern/_item/extension-set-attribute-Patterns/_item/extension-attribute-Pattern
   if (actx->external.direct_reference) {
@@ -90,9 +109,9 @@ Legal-Qualification-Attribute/actual-values	actual_values9
   }
 
 #.FN_BODY AP-title
-	/* XXX have no idea about this one */
+  /* XXX have no idea about this one */
 #.FN_BODY AE-qualifier
-	/* XXX have no idea about this one */
+  /* XXX have no idea about this one */
 
 #.FN_BODY FTAM-Regime-PDU VAL_PTR = &branch_taken
   gint branch_taken;
@@ -100,7 +119,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
   %(DEFAULT_BODY)s
 
   if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){
-	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr);
   }
 
 #.FN_BODY File-PDU VAL_PTR = &branch_taken
@@ -109,7 +128,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
   %(DEFAULT_BODY)s
 
   if( (branch_taken!=-1) && ftam_File_PDU_vals[branch_taken].strptr ){
-	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_File_PDU_vals[branch_taken].strptr);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_File_PDU_vals[branch_taken].strptr);
   }
 
 #.FN_BODY Bulk-Data-PDU VAL_PTR = &branch_taken
@@ -118,7 +137,7 @@ Legal-Qualification-Attribute/actual-values	actual_values9
   %(DEFAULT_BODY)s
 
   if( (branch_taken!=-1) && ftam_Bulk_Data_PDU_vals[branch_taken].strptr ){
-	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_Bulk_Data_PDU_vals[branch_taken].strptr);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_Bulk_Data_PDU_vals[branch_taken].strptr);
   }
 
 #.FN_BODY FSM-PDU VAL_PTR = &branch_taken
@@ -127,5 +146,19 @@ Legal-Qualification-Attribute/actual-values	actual_values9
   %(DEFAULT_BODY)s
 
   if( (branch_taken!=-1) && ftam_FSM_PDU_vals[branch_taken].strptr ){
-	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_FSM_PDU_vals[branch_taken].strptr);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %%s:", ftam_FSM_PDU_vals[branch_taken].strptr);
   }
+
+#
+# Editor modelines  -  https://www.wireshark.org/tools/modelines.html
+#
+# Local variables:
+# c-basic-offset: 2
+# tab-width: 8
+# indent-tabs-mode: nil
+# End:
+#
+# vi: set shiftwidth=2 tabstop=8 expandtab:
+# :indentSize=2:tabSize=8:noTabs=true:
+#
+
diff --git a/epan/dissectors/asn1/goose/goose.cnf b/epan/dissectors/asn1/goose/goose.cnf
index 3331736ca2..750ed29741 100644
--- a/epan/dissectors/asn1/goose/goose.cnf
+++ b/epan/dissectors/asn1/goose/goose.cnf
@@ -10,7 +10,11 @@
 #.NO_EMIT ONLY_VALS
 GOOSEpdu
 
-#.TYPE_RENAME
+#.FIELD_RENAME
+GetReferenceRequestPdu/offset getReferenceRequest_offset
+
+#.FIELD_ATTR
+GetReferenceRequestPdu/offset ABBREV=getReferenceRequest.offset
 
 
 #.FN_BODY UtcTime
diff --git a/epan/dissectors/packet-ansi_683.c b/epan/dissectors/packet-ansi_683.c
index 6f6817bdb7..1209b072e7 100644
--- a/epan/dissectors/packet-ansi_683.c
+++ b/epan/dissectors/packet-ansi_683.c
@@ -3361,17 +3361,17 @@ proto_register_ansi_683(void)
             NULL, HFILL }
         },
         { &hf_ansi_683_reserved8,
-            { "Reserved",         "ansi_683.reserved",
+            { "Reserved",         "ansi_683.reserved8",
             FT_BOOLEAN, BASE_NONE, NULL, 0,
             NULL, HFILL }
         },
         { &hf_ansi_683_reserved16_f,
-            { "Reserved",         "ansi_683.reserved",
+            { "Reserved",         "ansi_683.reserved16_f",
             FT_UINT16, BASE_HEX, NULL, 0x000f,
             NULL, HFILL }
         },
         { &hf_ansi_683_reserved24_f,
-            { "Reserved",         "ansi_683.reserved",
+            { "Reserved",         "ansi_683.reserved24_f",
             FT_UINT24, BASE_HEX, NULL, 0x00000f,
             NULL, HFILL }
         },
diff --git a/epan/dissectors/packet-camel.c b/epan/dissectors/packet-camel.c
index 48d2d53ca8..de62b039cb 100644
--- a/epan/dissectors/packet-camel.c
+++ b/epan/dissectors/packet-camel.c
@@ -316,7 +316,7 @@ static int hf_camel_metDPCriteriaList = -1;       /* MetDPCriteriaList */
 static int hf_camel_tChangeOfPositionSpecificInfo = -1;  /* T_tChangeOfPositionSpecificInfo */
 static int hf_camel_dpSpecificInfoAlt = -1;       /* DpSpecificInfoAlt */
 static int hf_camel_o_smsFailureSpecificInfo = -1;  /* T_o_smsFailureSpecificInfo */
-static int hf_camel_smsfailureCause = -1;         /* MO_SMSCause */
+static int hf_camel_mo_smsfailureCause = -1;      /* MO_SMSCause */
 static int hf_camel_o_smsSubmissionSpecificInfo = -1;  /* T_o_smsSubmissionSpecificInfo */
 static int hf_camel_t_smsFailureSpecificInfo = -1;  /* T_t_smsFailureSpecificInfo */
 static int hf_camel_t_smsfailureCause = -1;       /* MT_SMSCause */
@@ -3982,7 +3982,7 @@ dissect_camel_MO_SMSCause(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offs
 
 
 static const ber_sequence_t T_o_smsFailureSpecificInfo_sequence[] = {
-  { &hf_camel_smsfailureCause, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_MO_SMSCause },
+  { &hf_camel_mo_smsfailureCause, BER_CLASS_CON, 0, BER_FLAGS_OPTIONAL|BER_FLAGS_IMPLTAG, dissect_camel_MO_SMSCause },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -9172,7 +9172,7 @@ void proto_register_camel(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_routeSelectfailureCause,
-      { "failureCause", "camel.failureCause",
+      { "failureCause", "camel.routeSelectfailureCause",
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_camel_oCalledPartyBusySpecificInfo,
@@ -9307,8 +9307,8 @@ void proto_register_camel(void) {
       { "o-smsFailureSpecificInfo", "camel.o_smsFailureSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-    { &hf_camel_smsfailureCause,
-      { "failureCause", "camel.failureCause",
+    { &hf_camel_mo_smsfailureCause,
+      { "failureCause", "camel.mo-smsfailureCause",
         FT_UINT32, BASE_DEC, VALS(camel_MO_SMSCause_vals), 0,
         "MO_SMSCause", HFILL }},
     { &hf_camel_o_smsSubmissionSpecificInfo,
@@ -9320,7 +9320,7 @@ void proto_register_camel(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "T_t_smsFailureSpecificInfo", HFILL }},
     { &hf_camel_t_smsfailureCause,
-      { "failureCause", "camel.failureCause",
+      { "failureCause", "camel.t-smsfailureCause",
         FT_BYTES, BASE_NONE, NULL, 0,
         "MT_SMSCause", HFILL }},
     { &hf_camel_t_smsDeliverySpecificInfo,
diff --git a/epan/dissectors/packet-cipmotion.c b/epan/dissectors/packet-cipmotion.c
index 93fa0dc7c6..26d6fbd5d5 100644
--- a/epan/dissectors/packet-cipmotion.c
+++ b/epan/dissectors/packet-cipmotion.c
@@ -3307,7 +3307,7 @@ proto_register_cipmotion(void)
           "Cyclic Data Set: Actual Position", HFILL }
       },
       { &hf_cip_act_pos_64,
-        { "Actual Position", "cipm.actpos",
+        { "Actual Position", "cipm.actpos_64",
           FT_INT64, BASE_DEC, NULL, 0,
           "Cyclic Data Set: Actual Position", HFILL }
         },
diff --git a/epan/dissectors/packet-cmip.c b/epan/dissectors/packet-cmip.c
index c49bcf8d55..56277dc840 100644
--- a/epan/dissectors/packet-cmip.c
+++ b/epan/dissectors/packet-cmip.c
@@ -46,10 +46,7 @@ static int hf_cmip_actionType_OID = -1;
 static int hf_cmip_eventType_OID = -1;
 static int hf_cmip_attributeId_OID = -1;
 static int hf_cmip_errorId_OID = -1;
-static int hf_DiscriminatorConstruct = -1;
-static int hf_Destination = -1;
-static int hf_NameBinding = -1;
-static int hf_ObjectClass = -1;
+
 
 /*--- Included file: packet-cmip-hf.c ---*/
 #line 1 "./asn1/cmip/packet-cmip-hf.c"
@@ -331,7 +328,7 @@ static int hf_cmip_T_daysOfWeek_friday = -1;
 static int hf_cmip_T_daysOfWeek_saturday = -1;
 
 /*--- End of included file: packet-cmip-hf.c ---*/
-#line 46 "./asn1/cmip/packet-cmip-template.c"
+#line 43 "./asn1/cmip/packet-cmip-template.c"
 
 /* Initialize the subtree pointers */
 static gint ett_cmip = -1;
@@ -461,7 +458,7 @@ static gint ett_cmip_T_modificationList = -1;
 static gint ett_cmip_T_modificationList_item = -1;
 
 /*--- End of included file: packet-cmip-ett.c ---*/
-#line 50 "./asn1/cmip/packet-cmip-template.c"
+#line 47 "./asn1/cmip/packet-cmip-template.c"
 
 static expert_field ei_wrong_spdu_type = EI_INIT;
 
@@ -524,7 +521,7 @@ static const value_string cmip_error_code_vals[] = {
 
 
 /*--- End of included file: packet-cmip-table.c ---*/
-#line 61 "./asn1/cmip/packet-cmip-template.c"
+#line 58 "./asn1/cmip/packet-cmip-template.c"
 
 static int opcode_type;
 #define OPCODE_INVOKE        1
@@ -623,7 +620,7 @@ static const char *object_identifier_id;
 #define noInvokeId                     NULL
 
 /*--- End of included file: packet-cmip-val.h ---*/
-#line 71 "./asn1/cmip/packet-cmip-template.c"
+#line 68 "./asn1/cmip/packet-cmip-template.c"
 
 /*--- Included file: packet-cmip-fn.c ---*/
 #line 1 "./asn1/cmip/packet-cmip-fn.c"
@@ -3315,7 +3312,6 @@ dissect_cmip_T_featureInfo(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 
 
-
   return offset;
 }
 
@@ -4458,7 +4454,7 @@ static int dissect_WeekMask_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto
 
 
 /*--- End of included file: packet-cmip-fn.c ---*/
-#line 72 "./asn1/cmip/packet-cmip-template.c"
+#line 69 "./asn1/cmip/packet-cmip-template.c"
 
 
 
@@ -4533,22 +4529,6 @@ void proto_register_cmip(void) {
       { "errorId", "cmip.errorId_OID",
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
-   { &hf_DiscriminatorConstruct,
-      { "DiscriminatorConstruct", "cmip.DiscriminatorConstruct",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
-    { &hf_Destination,
-      { "Destination", "cmip.Destination",
-        FT_UINT32, BASE_DEC, NULL, 0,
-        NULL, HFILL }},
-    { &hf_NameBinding,
-      { "NameBinding", "cmip.NameBinding",
-        FT_STRING, BASE_NONE, NULL, 0,
-        NULL, HFILL }},
-    { &hf_ObjectClass,
-      { "ObjectClass", "cmip.ObjectClass",
-        FT_UINT32, BASE_DEC, VALS(cmip_ObjectClass_vals), 0,
-        NULL, HFILL }},
 
 
 /*--- Included file: packet-cmip-hfarr.c ---*/
@@ -4858,7 +4838,7 @@ void proto_register_cmip(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_cmip_attributeid,
-      { "id", "cmip.id",
+      { "id", "cmip.attributeid",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
         "AttributeId", HFILL }},
     { &hf_cmip_value,
@@ -5030,7 +5010,7 @@ void proto_register_cmip(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_filterItempresent,
-      { "present", "cmip.present",
+      { "present", "cmip.filterItempresent",
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
         "AttributeId", HFILL }},
     { &hf_cmip_subsetOf,
@@ -5510,7 +5490,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_T_linkedId_vals), 0,
         NULL, HFILL }},
     { &hf_cmip_linkedIdPresent,
-      { "present", "cmip.present",
+      { "present", "cmip.linkedIdPresent",
         FT_INT32, BASE_DEC, NULL, 0,
         "T_linkedIdPresent", HFILL }},
     { &hf_cmip_absent,
@@ -5655,7 +5635,7 @@ void proto_register_cmip(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-cmip-hfarr.c ---*/
-#line 164 "./asn1/cmip/packet-cmip-template.c"
+#line 145 "./asn1/cmip/packet-cmip-template.c"
   };
 
   /* List of subtrees */
@@ -5787,7 +5767,7 @@ void proto_register_cmip(void) {
     &ett_cmip_T_modificationList_item,
 
 /*--- End of included file: packet-cmip-ettarr.c ---*/
-#line 170 "./asn1/cmip/packet-cmip-template.c"
+#line 151 "./asn1/cmip/packet-cmip-template.c"
   };
 
   static ei_register_info ei[] = {
@@ -5882,7 +5862,7 @@ void proto_register_cmip(void) {
 
 
 /*--- End of included file: packet-cmip-dis-tab.c ---*/
-#line 189 "./asn1/cmip/packet-cmip-template.c"
+#line 170 "./asn1/cmip/packet-cmip-template.c"
     oid_add_from_string("discriminatorId(1)","2.9.3.2.7.1");
 
   attribute_id_dissector_table = register_dissector_table("cmip.attribute_id", "CMIP Attribute Id", proto_cmip, FT_UINT32, BASE_DEC);
diff --git a/epan/dissectors/packet-cmp.c b/epan/dissectors/packet-cmp.c
index 13270fd61e..701b5a9b98 100644
--- a/epan/dissectors/packet-cmp.c
+++ b/epan/dissectors/packet-cmp.c
@@ -171,6 +171,7 @@ static int hf_cmp_crls_item = -1;                 /* CertificateList */
 static int hf_cmp_oldWithNew = -1;                /* CMPCertificate */
 static int hf_cmp_newWithOld = -1;                /* CMPCertificate */
 static int hf_cmp_newWithNew = -1;                /* CMPCertificate */
+static int hf_cmp_pkistatus_01 = -1;              /* PKIStatus */
 static int hf_cmp_willBeRevokedAt = -1;           /* GeneralizedTime */
 static int hf_cmp_badSinceDate = -1;              /* GeneralizedTime */
 static int hf_cmp_crlDetails = -1;                /* Extensions */
@@ -816,7 +817,7 @@ dissect_cmp_CertAnnContent(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 
 static const ber_sequence_t RevAnnContent_sequence[] = {
-  { &hf_cmp_pkistatus       , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_cmp_PKIStatus },
+  { &hf_cmp_pkistatus_01    , BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_cmp_PKIStatus },
   { &hf_cmp_certId          , BER_CLASS_UNI, BER_UNI_TAG_SEQUENCE, BER_FLAGS_NOOWNTAG, dissect_crmf_CertId },
   { &hf_cmp_willBeRevokedAt , BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_cmp_GeneralizedTime },
   { &hf_cmp_badSinceDate    , BER_CLASS_UNI, BER_UNI_TAG_GeneralizedTime, BER_FLAGS_NOOWNTAG, dissect_cmp_GeneralizedTime },
@@ -1980,7 +1981,7 @@ void proto_register_cmp(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_cmp_pkistatus,
-      { "status", "cmp.status",
+      { "status", "cmp.pkistatus",
         FT_INT32, BASE_DEC, VALS(cmp_PKIStatus_vals), 0,
         "PKIStatus", HFILL }},
     { &hf_cmp_statusString,
@@ -2104,7 +2105,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Extensions", HFILL }},
     { &hf_cmp_rvrpcnt_status,
-      { "status", "cmp.status",
+      { "status", "cmp.rvrpcnt_status",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo", HFILL }},
     { &hf_cmp_rvrpcnt_status_item,
@@ -2139,6 +2140,10 @@ void proto_register_cmp(void) {
       { "newWithNew", "cmp.newWithNew",
         FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0,
         "CMPCertificate", HFILL }},
+    { &hf_cmp_pkistatus_01,
+      { "status", "cmp.status",
+        FT_INT32, BASE_DEC, VALS(cmp_PKIStatus_vals), 0,
+        "PKIStatus", HFILL }},
     { &hf_cmp_willBeRevokedAt,
       { "willBeRevokedAt", "cmp.willBeRevokedAt",
         FT_STRING, BASE_NONE, NULL, 0,
diff --git a/epan/dissectors/packet-dap.c b/epan/dissectors/packet-dap.c
index b1af4c4363..af21d0f31d 100644
--- a/epan/dissectors/packet-dap.c
+++ b/epan/dissectors/packet-dap.c
@@ -838,6 +838,7 @@ dissect_dap_Name(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, a
 	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s", (dn && *dn) ? dn : "(root)");
 
 
+
   return offset;
 }
 
@@ -5433,7 +5434,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
         "DirectoryString", HFILL }},
     { &hf_dap_saslCredentials,
-      { "credentials", "dap.credentials",
+      { "credentials", "dap.saslCredentials",
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_dap_saslAbort,
@@ -5445,7 +5446,7 @@ void proto_register_dap(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_dap_utctime,
-      { "time", "dap.time",
+      { "time", "dap.utctime",
         FT_STRING, BASE_NONE, NULL, 0,
         "UTCTime", HFILL }},
     { &hf_dap_bindIntAlgorithm,
@@ -6193,7 +6194,7 @@ void proto_register_dap(void) {
         FT_INT32, BASE_DEC, VALS(dap_NameProblem_vals), 0,
         "NameProblem", HFILL }},
     { &hf_dap_matched_name,
-      { "matched", "dap.matched",
+      { "matched", "dap.matched_name",
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_dap_unsignedNameError,
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c
index 2d80320980..31ace80695 100644
--- a/epan/dissectors/packet-disp.c
+++ b/epan/dissectors/packet-disp.c
@@ -645,7 +645,7 @@ static const value_string disp_StandardUpdate_vals[] = {
 
 static int
 dissect_disp_StandardUpdate(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 63 "./asn1/disp/disp.cnf"
+#line 65 "./asn1/disp/disp.cnf"
   guint32 update;
 
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
@@ -835,7 +835,7 @@ static const ber_choice_t CoordinateShadowUpdateResult_choice[] = {
 
 static int
 dissect_disp_CoordinateShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 73 "./asn1/disp/disp.cnf"
+#line 75 "./asn1/disp/disp.cnf"
   guint32 update;
 
     offset = dissect_ber_choice(actx, tree, tvb, offset,
@@ -860,7 +860,7 @@ static const value_string disp_T_standard_vals[] = {
 
 static int
 dissect_disp_T_standard(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 43 "./asn1/disp/disp.cnf"
+#line 45 "./asn1/disp/disp.cnf"
   guint32 update;
 
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
@@ -960,7 +960,7 @@ static const ber_choice_t RequestShadowUpdateResult_choice[] = {
 
 static int
 dissect_disp_RequestShadowUpdateResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 83 "./asn1/disp/disp.cnf"
+#line 85 "./asn1/disp/disp.cnf"
   guint32 update;
 
     offset = dissect_ber_choice(actx, tree, tvb, offset,
@@ -1262,7 +1262,7 @@ static const ber_choice_t RefreshInformation_choice[] = {
 
 static int
 dissect_disp_RefreshInformation(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 53 "./asn1/disp/disp.cnf"
+#line 55 "./asn1/disp/disp.cnf"
   guint32 update;
 
     offset = dissect_ber_choice(actx, tree, tvb, offset,
@@ -1342,7 +1342,7 @@ static const ber_choice_t UpdateShadowResult_choice[] = {
 
 static int
 dissect_disp_UpdateShadowResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 93 "./asn1/disp/disp.cnf"
+#line 95 "./asn1/disp/disp.cnf"
   guint32 update;
 
     offset = dissect_ber_choice(actx, tree, tvb, offset,
@@ -1376,7 +1376,7 @@ static const value_string disp_ShadowProblem_vals[] = {
 
 static int
 dissect_disp_ShadowProblem(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 103 "./asn1/disp/disp.cnf"
+#line 105 "./asn1/disp/disp.cnf"
   guint32 problem;
 
     offset = dissect_ber_integer(implicit_tag, actx, tree, tvb, offset, hf_index,
@@ -1608,7 +1608,7 @@ void proto_register_disp(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_disp_modifiedSecondaryShadows,
-      { "secondaryShadows", "disp.secondaryShadows",
+      { "secondaryShadows", "disp.modifiedSecondaryShadows",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_SupplierAndConsumers", HFILL }},
     { &hf_disp_modifiedSecondaryShadows_item,
diff --git a/epan/dissectors/packet-dlep.c b/epan/dissectors/packet-dlep.c
index f1a8d17b41..55be5c9ab0 100644
--- a/epan/dissectors/packet-dlep.c
+++ b/epan/dissectors/packet-dlep.c
@@ -1225,10 +1225,10 @@ proto_register_dlep(void)
       { "Code", "dlep.dataitem.extsupp.code", FT_UINT32, BASE_DEC|BASE_RANGE_STRING, RVALS(extension_code_vals), 0x0, NULL, HFILL }
     },
     { &hf_dlep_dataitem_macaddr_eui48,
-      { "MAC Address", "dlep.dataitem.macaddr", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }
+      { "MAC Address", "dlep.dataitem.macaddr_eui48", FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_dlep_dataitem_macaddr_eui64,
-      { "MAC Address", "dlep.dataitem.macaddr", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }
+      { "MAC Address", "dlep.dataitem.macaddr_eui64", FT_EUI64, BASE_NONE, NULL, 0x0, NULL, HFILL }
     },
     { &hf_dlep_dataitem_v4addr,
       { "IPv4 Address", "dlep.dataitem.v4addr", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }
diff --git a/epan/dissectors/packet-dtn.c b/epan/dissectors/packet-dtn.c
index 5759cfc215..0fa1ff75a4 100644
--- a/epan/dissectors/packet-dtn.c
+++ b/epan/dissectors/packet-dtn.c
@@ -2703,7 +2703,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.primary.processing.control.flag",
           FT_UINT64, BASE_HEX, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_procflags_general,
@@ -2771,11 +2771,11 @@ 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,
-         {"Timestamp Sequence Number", "bundle.primary.timestamp_seq_num",
+         {"Timestamp Sequence Number", "bundle.primary.timestamp_seq_num32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_primary_timestamp,
@@ -2783,67 +2783,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.destschemeoffu16",
           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.destschemeoffi32",
           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.destssspoffu16",
           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.destssspoffi32",
           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.srcschemeoffu16",
           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.srcschemeoffi32",
           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.srcsspoffu16",
           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.srcsspoffi32",
           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.rptschemeoffu16",
           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.rptschemeoffi32",
           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.rptsspoffu16",
           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.rptsspoffi32",
           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.custschemeoffu16",
           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.custschemeoffi32",
           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.custsspoffu16",
           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.custsspoffi32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_dest_scheme,
@@ -2887,7 +2887,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,
@@ -2967,11 +2967,11 @@ 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,
-         {"Timestamp Sequence Number", "bundle.admin.timestamp_seq_num",
+         {"Timestamp Sequence Number", "bundle.admin.timestamp_seq_num32",
           FT_INT32, BASE_DEC, NULL, 0x0, NULL, HFILL}
         },
         {&hf_bundle_admin_endpoint_length,
diff --git a/epan/dissectors/packet-ftam.c b/epan/dissectors/packet-ftam.c
index 57de297de3..c622ca55ef 100644
--- a/epan/dissectors/packet-ftam.c
+++ b/epan/dissectors/packet-ftam.c
@@ -1301,7 +1301,7 @@ static const ber_choice_t FTAM_Regime_PDU_choice[] = {
 
 static int
 dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 98 "./asn1/ftam/ftam.cnf"
+#line 117 "./asn1/ftam/ftam.cnf"
   gint branch_taken;
 
     offset = dissect_ber_choice(actx, tree, tvb, offset,
@@ -1310,7 +1310,7 @@ dissect_ftam_FTAM_Regime_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int o
 
 
   if( (branch_taken!=-1) && ftam_FTAM_Regime_PDU_vals[branch_taken].strptr ){
-	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_FTAM_Regime_PDU_vals[branch_taken].strptr);
   }
 
 
@@ -1696,7 +1696,7 @@ dissect_ftam_Permitted_Actions_Attribute(gboolean implicit_tag _U_, tvbuff_t *tv
 
 static int
 dissect_ftam_T_parameter(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 75 "./asn1/ftam/ftam.cnf"
+#line 94 "./asn1/ftam/ftam.cnf"
   if (actx->external.direct_reference) {
     offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL);
   }
@@ -1902,8 +1902,8 @@ dissect_ftam_Concurrency_Access(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, in
 
 static int
 dissect_ftam_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 93 "./asn1/ftam/ftam.cnf"
-	/* XXX have no idea about this one */
+#line 112 "./asn1/ftam/ftam.cnf"
+  /* XXX have no idea about this one */
 
 
   return offset;
@@ -1913,8 +1913,8 @@ dissect_ftam_AP_title(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
 
 static int
 dissect_ftam_AE_qualifier(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 95 "./asn1/ftam/ftam.cnf"
-	/* XXX have no idea about this one */
+#line 114 "./asn1/ftam/ftam.cnf"
+  /* XXX have no idea about this one */
 
 
 
@@ -2067,7 +2067,7 @@ dissect_ftam_T_extension_attribute_identifier(gboolean implicit_tag _U_, tvbuff_
 
 static int
 dissect_ftam_T_extension_attribute(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 80 "./asn1/ftam/ftam.cnf"
+#line 99 "./asn1/ftam/ftam.cnf"
   if (actx->external.direct_reference) {
     offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL);
   }
@@ -3133,7 +3133,7 @@ static const ber_choice_t File_PDU_choice[] = {
 
 static int
 dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 107 "./asn1/ftam/ftam.cnf"
+#line 126 "./asn1/ftam/ftam.cnf"
   gint branch_taken;
 
     offset = dissect_ber_choice(actx, tree, tvb, offset,
@@ -3142,7 +3142,7 @@ dissect_ftam_File_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _
 
 
   if( (branch_taken!=-1) && ftam_File_PDU_vals[branch_taken].strptr ){
-	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_File_PDU_vals[branch_taken].strptr);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_File_PDU_vals[branch_taken].strptr);
   }
 
 
@@ -3437,7 +3437,7 @@ static const ber_choice_t Bulk_Data_PDU_choice[] = {
 
 static int
 dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 116 "./asn1/ftam/ftam.cnf"
+#line 135 "./asn1/ftam/ftam.cnf"
   gint branch_taken;
 
     offset = dissect_ber_choice(actx, tree, tvb, offset,
@@ -3446,7 +3446,7 @@ dissect_ftam_Bulk_Data_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off
 
 
   if( (branch_taken!=-1) && ftam_Bulk_Data_PDU_vals[branch_taken].strptr ){
-	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_Bulk_Data_PDU_vals[branch_taken].strptr);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_Bulk_Data_PDU_vals[branch_taken].strptr);
   }
 
 
@@ -3779,7 +3779,7 @@ dissect_ftam_T_attribute_extension_attribute_identifier(gboolean implicit_tag _U
 
 static int
 dissect_ftam_T_extension_attribute_Pattern(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 88 "./asn1/ftam/ftam.cnf"
+#line 107 "./asn1/ftam/ftam.cnf"
   if (actx->external.direct_reference) {
     offset=call_ber_oid_callback(actx->external.direct_reference, tvb, offset, actx->pinfo, tree, NULL);
   }
@@ -4701,7 +4701,7 @@ static const ber_choice_t FSM_PDU_choice[] = {
 
 static int
 dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 125 "./asn1/ftam/ftam.cnf"
+#line 144 "./asn1/ftam/ftam.cnf"
   gint branch_taken;
 
     offset = dissect_ber_choice(actx, tree, tvb, offset,
@@ -4710,10 +4710,12 @@ dissect_ftam_FSM_PDU(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U
 
 
   if( (branch_taken!=-1) && ftam_FSM_PDU_vals[branch_taken].strptr ){
-	col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_FSM_PDU_vals[branch_taken].strptr);
+    col_append_fstr(actx->pinfo->cinfo, COL_INFO, " %s:", ftam_FSM_PDU_vals[branch_taken].strptr);
   }
 
 
+
+
   return offset;
 }
 
@@ -5516,7 +5518,7 @@ void proto_register_ftam(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_actual_values3,
-      { "actual-values", "ftam.actual_values",
+      { "actual-values", "ftam.actual_values3",
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Access_Control_Element", HFILL }},
     { &hf_ftam_actual_values3_item,
@@ -5524,7 +5526,7 @@ void proto_register_ftam(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_actual_values1,
-      { "actual-values", "ftam.actual_values_element",
+      { "actual-values", "ftam.actual_values1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_actual_values1", HFILL }},
     { &hf_ftam_insert_values,
@@ -5564,39 +5566,39 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, VALS(acse_AE_title_vals), 0,
         "Application_Entity_Title", HFILL }},
     { &hf_ftam_read_key,
-      { "read", "ftam.read",
+      { "read", "ftam.read_key",
         FT_BYTES, BASE_NONE, NULL, 0,
         "Concurrency_Key", HFILL }},
     { &hf_ftam_insert_key,
-      { "insert", "ftam.insert",
+      { "insert", "ftam.insert_key",
         FT_BYTES, BASE_NONE, NULL, 0,
         "Concurrency_Key", HFILL }},
     { &hf_ftam_replace_key,
-      { "replace", "ftam.replace",
+      { "replace", "ftam.replace_key",
         FT_BYTES, BASE_NONE, NULL, 0,
         "Concurrency_Key", HFILL }},
     { &hf_ftam_extend_key,
-      { "extend", "ftam.extend",
+      { "extend", "ftam.extend_key",
         FT_BYTES, BASE_NONE, NULL, 0,
         "Concurrency_Key", HFILL }},
     { &hf_ftam_erase_key,
-      { "erase", "ftam.erase",
+      { "erase", "ftam.erase_key",
         FT_BYTES, BASE_NONE, NULL, 0,
         "Concurrency_Key", HFILL }},
     { &hf_ftam_read_attribute_key,
-      { "read-attribute", "ftam.read_attribute",
+      { "read-attribute", "ftam.read_attribute_key",
         FT_BYTES, BASE_NONE, NULL, 0,
         "Concurrency_Key", HFILL }},
     { &hf_ftam_change_attribute_key,
-      { "change-attribute", "ftam.change_attribute",
+      { "change-attribute", "ftam.change_attribute_key",
         FT_BYTES, BASE_NONE, NULL, 0,
         "Concurrency_Key", HFILL }},
     { &hf_ftam_delete_Object_key,
-      { "delete-Object", "ftam.delete_Object",
+      { "delete-Object", "ftam.delete_Object_key",
         FT_BYTES, BASE_NONE, NULL, 0,
         "Concurrency_Key", HFILL }},
     { &hf_ftam_actual_values2,
-      { "actual-values", "ftam.actual_values",
+      { "actual-values", "ftam.actual_values2",
         FT_STRING, BASE_NONE, NULL, 0,
         "Account", HFILL }},
     { &hf_ftam_document_type,
@@ -5616,11 +5618,11 @@ void proto_register_ftam(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_actual_values5,
-      { "actual-values", "ftam.actual_values",
+      { "actual-values", "ftam.actual_values5",
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_ftam_actual_values8,
-      { "actual-values", "ftam.actual_values",
+      { "actual-values", "ftam.actual_values8",
         FT_INT32, BASE_DEC, VALS(ftam_T_actual_values8_vals), 0,
         "T_actual_values8", HFILL }},
     { &hf_ftam_incomplete_pathname,
@@ -5632,11 +5634,11 @@ void proto_register_ftam(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Pathname", HFILL }},
     { &hf_ftam_actual_values7,
-      { "actual-values", "ftam.actual_values",
+      { "actual-values", "ftam.actual_values7",
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_ftam_actual_values9,
-      { "actual-values", "ftam.actual_values",
+      { "actual-values", "ftam.actual_values9",
         FT_STRING, BASE_NONE, NULL, 0,
         "GraphicString", HFILL }},
     { &hf_ftam_abstract_Syntax_not_supported,
@@ -5644,11 +5646,11 @@ void proto_register_ftam(void) {
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ftam_actual_values4,
-      { "actual-values", "ftam.actual_values_element",
+      { "actual-values", "ftam.actual_values4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_ftam_actual_values6,
-      { "actual-values", "ftam.actual_values",
+      { "actual-values", "ftam.actual_values6",
         FT_STRING, BASE_NONE, NULL, 0,
         "User_Identity", HFILL }},
     { &hf_ftam_Child_Objects_Attribute_item,
diff --git a/epan/dissectors/packet-ftdi-ft.c b/epan/dissectors/packet-ftdi-ft.c
index 19819f5935..2f9b7a28c1 100644
--- a/epan/dissectors/packet-ftdi-ft.c
+++ b/epan/dissectors/packet-ftdi-ft.c
@@ -1511,12 +1511,12 @@ proto_register_ftdi_ft(void)
             NULL, HFILL }
         },
         { &hf_setup_hindex_baud_high,
-          { "Baud High", "ftdi-ft.hIndex.b0",
+          { "Baud High", "ftdi-ft.baud_high.b0",
             FT_UINT8, BASE_HEX, NULL, (1 << 0),
             NULL, HFILL }
         },
         { &hf_setup_hindex_baud_clock_divide,
-          { "Baud Clock Divide off", "ftdi-ft.hIndex.b1",
+          { "Baud Clock Divide off", "ftdi-ft.baud_clock_divide.b1",
             FT_BOOLEAN, 8, NULL, (1 << 1),
             "When active 120 MHz is max frequency instead of 48 MHz", HFILL }
         },
diff --git a/epan/dissectors/packet-goose.c b/epan/dissectors/packet-goose.c
index 3302538ab0..00f4efb749 100644
--- a/epan/dissectors/packet-goose.c
+++ b/epan/dissectors/packet-goose.c
@@ -89,8 +89,8 @@ static int hf_goose_gseMngtResponses_GetGOOSEElementNumber = -1;  /* GSEMngtResp
 static int hf_goose_gseMngtResponses_GetGSReference = -1;  /* GSEMngtResponsePdu */
 static int hf_goose_gseMngtResponses_GetGSSEDataOffset = -1;  /* GSEMngtResponsePdu */
 static int hf_goose_ident = -1;                   /* VisibleString */
-static int hf_goose_getReferenceRequestPDU_offset = -1;  /* T_getReferenceRequestPDU_offset */
-static int hf_goose_getReferenceRequestPDU_offset_item = -1;  /* INTEGER */
+static int hf_goose_getReferenceRequest_offset = -1;  /* T_getReferenceRequest_offset */
+static int hf_goose_getReferenceRequest_offset_item = -1;  /* INTEGER */
 static int hf_goose_references = -1;              /* T_references */
 static int hf_goose_references_item = -1;         /* VisibleString */
 static int hf_goose_confRev = -1;                 /* INTEGER */
@@ -153,7 +153,7 @@ static gint ett_goose_RequestResponse = -1;
 static gint ett_goose_GSEMngtRequests = -1;
 static gint ett_goose_GSEMngtResponses = -1;
 static gint ett_goose_GetReferenceRequestPdu = -1;
-static gint ett_goose_T_getReferenceRequestPDU_offset = -1;
+static gint ett_goose_T_getReferenceRequest_offset = -1;
 static gint ett_goose_GetElementRequestPdu = -1;
 static gint ett_goose_T_references = -1;
 static gint ett_goose_GSEMngtResponsePdu = -1;
@@ -199,14 +199,14 @@ dissect_goose_VisibleString(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of
 }
 
 
-static const ber_sequence_t T_getReferenceRequestPDU_offset_sequence_of[1] = {
-  { &hf_goose_getReferenceRequestPDU_offset_item, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_goose_INTEGER },
+static const ber_sequence_t T_getReferenceRequest_offset_sequence_of[1] = {
+  { &hf_goose_getReferenceRequest_offset_item, BER_CLASS_UNI, BER_UNI_TAG_INTEGER, BER_FLAGS_NOOWNTAG, dissect_goose_INTEGER },
 };
 
 static int
-dissect_goose_T_getReferenceRequestPDU_offset(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+dissect_goose_T_getReferenceRequest_offset(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
   offset = dissect_ber_sequence_of(implicit_tag, actx, tree, tvb, offset,
-                                      T_getReferenceRequestPDU_offset_sequence_of, hf_index, ett_goose_T_getReferenceRequestPDU_offset);
+                                      T_getReferenceRequest_offset_sequence_of, hf_index, ett_goose_T_getReferenceRequest_offset);
 
   return offset;
 }
@@ -214,7 +214,7 @@ dissect_goose_T_getReferenceRequestPDU_offset(gboolean implicit_tag _U_, tvbuff_
 
 static const ber_sequence_t GetReferenceRequestPdu_sequence[] = {
   { &hf_goose_ident         , BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_goose_VisibleString },
-  { &hf_goose_getReferenceRequestPDU_offset, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_goose_T_getReferenceRequestPDU_offset },
+  { &hf_goose_getReferenceRequest_offset, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_goose_T_getReferenceRequest_offset },
   { NULL, 0, 0, 0, NULL }
 };
 
@@ -493,7 +493,7 @@ dissect_goose_GSEMngtPdu(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offse
 
 static int
 dissect_goose_UtcTime(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
-#line 17 "./asn1/goose/goose.cnf"
+#line 21 "./asn1/goose/goose.cnf"
 
 	guint32 len;
 	guint32 seconds;
@@ -1200,11 +1200,11 @@ void proto_register_goose(void) {
       { "ident", "goose.ident",
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString", HFILL }},
-    { &hf_goose_getReferenceRequestPDU_offset,
-      { "offset", "goose.offset",
+    { &hf_goose_getReferenceRequest_offset,
+      { "offset", "goose.getReferenceRequest.offset",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "T_getReferenceRequestPDU_offset", HFILL }},
-    { &hf_goose_getReferenceRequestPDU_offset_item,
+        "T_getReferenceRequest_offset", HFILL }},
+    { &hf_goose_getReferenceRequest_offset_item,
       { "offset item", "goose.offset_item",
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
@@ -1394,7 +1394,7 @@ void proto_register_goose(void) {
     &ett_goose_GSEMngtRequests,
     &ett_goose_GSEMngtResponses,
     &ett_goose_GetReferenceRequestPdu,
-    &ett_goose_T_getReferenceRequestPDU_offset,
+    &ett_goose_T_getReferenceRequest_offset,
     &ett_goose_GetElementRequestPdu,
     &ett_goose_T_references,
     &ett_goose_GSEMngtResponsePdu,