ASN.1 dissectors regenerated with new asn2wrs to get updated field blurb

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@18921 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 99 insertions, 99 deletions

diff --git a/epan/dissectors/packet-acse.c b/epan/dissectors/packet-acse.c
index c3b696ccac..a626bcc24a 100644
--- a/epan/dissectors/packet-acse.c
+++ b/epan/dissectors/packet-acse.c
@@ -1986,399 +1986,399 @@ void proto_register_acse(void) {
     { &hf_acse_direct_reference,
       { "direct-reference", "acse.direct_reference",
         FT_OID, BASE_NONE, NULL, 0,
-        "EXTERNAL/direct-reference", HFILL }},
+        "acse.T_direct_reference", HFILL }},
     { &hf_acse_indirect_reference,
       { "indirect-reference", "acse.indirect_reference",
         FT_INT32, BASE_DEC, NULL, 0,
-        "EXTERNAL/indirect-reference", HFILL }},
+        "acse.T_indirect_reference", HFILL }},
     { &hf_acse_data_value_descriptor,
       { "data-value-descriptor", "acse.data_value_descriptor",
         FT_STRING, BASE_NONE, NULL, 0,
-        "EXTERNAL/data-value-descriptor", HFILL }},
+        "acse.ObjectDescriptor", HFILL }},
     { &hf_acse_encoding,
       { "encoding", "acse.encoding",
         FT_UINT32, BASE_DEC, VALS(acse_T_encoding_vals), 0,
-        "EXTERNAL/encoding", HFILL }},
+        "acse.T_encoding", HFILL }},
     { &hf_acse_single_ASN1_type,
       { "single-ASN1-type", "acse.single_ASN1_type",
         FT_NONE, BASE_NONE, NULL, 0,
-        "EXTERNAL/encoding/single-ASN1-type", HFILL }},
+        "acse.T_single_ASN1_type", HFILL }},
     { &hf_acse_octet_aligned,
       { "octet-aligned", "acse.octet_aligned",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "acse.OCTET_STRING", HFILL }},
     { &hf_acse_arbitrary,
       { "arbitrary", "acse.arbitrary",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "", HFILL }},
+        "acse.BIT_STRING", HFILL }},
     { &hf_acse_aarq,
       { "aarq", "acse.aarq",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ACSE-apdu/aarq", HFILL }},
+        "acse.AARQ_apdu", HFILL }},
     { &hf_acse_aare,
       { "aare", "acse.aare",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ACSE-apdu/aare", HFILL }},
+        "acse.AARE_apdu", HFILL }},
     { &hf_acse_rlrq,
       { "rlrq", "acse.rlrq",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ACSE-apdu/rlrq", HFILL }},
+        "acse.RLRQ_apdu", HFILL }},
     { &hf_acse_rlre,
       { "rlre", "acse.rlre",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ACSE-apdu/rlre", HFILL }},
+        "acse.RLRE_apdu", HFILL }},
     { &hf_acse_abrt,
       { "abrt", "acse.abrt",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ACSE-apdu/abrt", HFILL }},
+        "acse.ABRT_apdu", HFILL }},
     { &hf_acse_adt,
       { "adt", "acse.adt",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ACSE-apdu/adt", HFILL }},
+        "acse.A_DT_apdu", HFILL }},
     { &hf_acse_acrq,
       { "acrq", "acse.acrq",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ACSE-apdu/acrq", HFILL }},
+        "acse.ACRQ_apdu", HFILL }},
     { &hf_acse_acrp,
       { "acrp", "acse.acrp",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ACSE-apdu/acrp", HFILL }},
+        "acse.ACRP_apdu", HFILL }},
     { &hf_acse_aARQ_protocol_version,
       { "protocol-version", "acse.protocol_version",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "AARQ-apdu/protocol-version", HFILL }},
+        "acse.T_AARQ_protocol_version", HFILL }},
     { &hf_acse_aARQ_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "AARQ-apdu/aSO-context-name", HFILL }},
+        "acse.T_AARQ_aSO_context_name", HFILL }},
     { &hf_acse_called_AP_title,
       { "called-AP-title", "acse.called_AP_title",
         FT_UINT32, BASE_DEC, VALS(acse_AP_title_vals), 0,
-        "AARQ-apdu/called-AP-title", HFILL }},
+        "acse.AP_title", HFILL }},
     { &hf_acse_called_AE_qualifier,
       { "called-AE-qualifier", "acse.called_AE_qualifier",
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
-        "AARQ-apdu/called-AE-qualifier", HFILL }},
+        "acse.AE_qualifier", HFILL }},
     { &hf_acse_called_AP_invocation_identifier,
       { "called-AP-invocation-identifier", "acse.called_AP_invocation_identifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "AARQ-apdu/called-AP-invocation-identifier", HFILL }},
+        "acse.AP_invocation_identifier", HFILL }},
     { &hf_acse_called_AE_invocation_identifier,
       { "called-AE-invocation-identifier", "acse.called_AE_invocation_identifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "AARQ-apdu/called-AE-invocation-identifier", HFILL }},
+        "acse.AE_invocation_identifier", HFILL }},
     { &hf_acse_calling_AP_title,
       { "calling-AP-title", "acse.calling_AP_title",
         FT_UINT32, BASE_DEC, VALS(acse_AP_title_vals), 0,
-        "AARQ-apdu/calling-AP-title", HFILL }},
+        "acse.AP_title", HFILL }},
     { &hf_acse_calling_AE_qualifier,
       { "calling-AE-qualifier", "acse.calling_AE_qualifier",
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
-        "AARQ-apdu/calling-AE-qualifier", HFILL }},
+        "acse.AE_qualifier", HFILL }},
     { &hf_acse_calling_AP_invocation_identifier,
       { "calling-AP-invocation-identifier", "acse.calling_AP_invocation_identifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "AARQ-apdu/calling-AP-invocation-identifier", HFILL }},
+        "acse.AP_invocation_identifier", HFILL }},
     { &hf_acse_calling_AE_invocation_identifier,
       { "calling-AE-invocation-identifier", "acse.calling_AE_invocation_identifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "AARQ-apdu/calling-AE-invocation-identifier", HFILL }},
+        "acse.AE_invocation_identifier", HFILL }},
     { &hf_acse_sender_acse_requirements,
       { "sender-acse-requirements", "acse.sender_acse_requirements",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "AARQ-apdu/sender-acse-requirements", HFILL }},
+        "acse.ACSE_requirements", HFILL }},
     { &hf_acse_mechanism_name,
       { "mechanism-name", "acse.mechanism_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "acse.Mechanism_name", HFILL }},
     { &hf_acse_calling_authentication_value,
       { "calling-authentication-value", "acse.calling_authentication_value",
         FT_UINT32, BASE_DEC, VALS(acse_Authentication_value_vals), 0,
-        "AARQ-apdu/calling-authentication-value", HFILL }},
+        "acse.Authentication_value", HFILL }},
     { &hf_acse_aSO_context_name_list,
       { "aSO-context-name-list", "acse.aSO_context_name_list",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "acse.ASO_context_name_list", HFILL }},
     { &hf_acse_implementation_information,
       { "implementation-information", "acse.implementation_information",
         FT_STRING, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "acse.Implementation_data", HFILL }},
     { &hf_acse_p_context_definition_list,
       { "p-context-definition-list", "acse.p_context_definition_list",
         FT_UINT32, BASE_DEC, VALS(acse_Syntactic_context_list_vals), 0,
-        "", HFILL }},
+        "acse.Syntactic_context_list", HFILL }},
     { &hf_acse_called_asoi_tag,
       { "called-asoi-tag", "acse.called_asoi_tag",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "acse.ASOI_tag", HFILL }},
     { &hf_acse_calling_asoi_tag,
       { "calling-asoi-tag", "acse.calling_asoi_tag",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "acse.ASOI_tag", HFILL }},
     { &hf_acse_aARQ_user_information,
       { "user-information", "acse.user_information",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AARQ-apdu/user-information", HFILL }},
+        "acse.Association_data", HFILL }},
     { &hf_acse_aARE_protocol_version,
       { "protocol-version", "acse.protocol_version",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "AARE-apdu/protocol-version", HFILL }},
+        "acse.T_AARE_protocol_version", HFILL }},
     { &hf_acse_aARE_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "AARE-apdu/aSO-context-name", HFILL }},
+        "acse.T_AARE_aSO_context_name", HFILL }},
     { &hf_acse_aARE_result,
       { "result", "acse.result",
         FT_UINT32, BASE_DEC, VALS(acse_Associate_result_vals), 0,
-        "AARE-apdu/result", HFILL }},
+        "acse.Associate_result", HFILL }},
     { &hf_acse_result_source_diagnostic,
       { "result-source-diagnostic", "acse.result_source_diagnostic",
         FT_UINT32, BASE_DEC, VALS(acse_Associate_source_diagnostic_vals), 0,
-        "AARE-apdu/result-source-diagnostic", HFILL }},
+        "acse.Associate_source_diagnostic", HFILL }},
     { &hf_acse_responding_AP_title,
       { "responding-AP-title", "acse.responding_AP_title",
         FT_UINT32, BASE_DEC, VALS(acse_AP_title_vals), 0,
-        "AARE-apdu/responding-AP-title", HFILL }},
+        "acse.AP_title", HFILL }},
     { &hf_acse_responding_AE_qualifier,
       { "responding-AE-qualifier", "acse.responding_AE_qualifier",
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
-        "AARE-apdu/responding-AE-qualifier", HFILL }},
+        "acse.AE_qualifier", HFILL }},
     { &hf_acse_responding_AP_invocation_identifier,
       { "responding-AP-invocation-identifier", "acse.responding_AP_invocation_identifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "AARE-apdu/responding-AP-invocation-identifier", HFILL }},
+        "acse.AP_invocation_identifier", HFILL }},
     { &hf_acse_responding_AE_invocation_identifier,
       { "responding-AE-invocation-identifier", "acse.responding_AE_invocation_identifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "AARE-apdu/responding-AE-invocation-identifier", HFILL }},
+        "acse.AE_invocation_identifier", HFILL }},
     { &hf_acse_responder_acse_requirements,
       { "responder-acse-requirements", "acse.responder_acse_requirements",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "AARE-apdu/responder-acse-requirements", HFILL }},
+        "acse.ACSE_requirements", HFILL }},
     { &hf_acse_responding_authentication_value,
       { "responding-authentication-value", "acse.responding_authentication_value",
         FT_UINT32, BASE_DEC, VALS(acse_Authentication_value_vals), 0,
-        "AARE-apdu/responding-authentication-value", HFILL }},
+        "acse.Authentication_value", HFILL }},
     { &hf_acse_p_context_result_list,
       { "p-context-result-list", "acse.p_context_result_list",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "acse.P_context_result_list", HFILL }},
     { &hf_acse_aARE_user_information,
       { "user-information", "acse.user_information",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "AARE-apdu/user-information", HFILL }},
+        "acse.Association_data", HFILL }},
     { &hf_acse_rLRQ_reason,
       { "reason", "acse.reason",
         FT_INT32, BASE_DEC, VALS(acse_Release_request_reason_vals), 0,
-        "RLRQ-apdu/reason", HFILL }},
+        "acse.Release_request_reason", HFILL }},
     { &hf_acse_aso_qualifier,
       { "aso-qualifier", "acse.aso_qualifier",
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
-        "", HFILL }},
+        "acse.ASO_qualifier", HFILL }},
     { &hf_acse_asoi_identifier,
       { "asoi-identifier", "acse.asoi_identifier",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "acse.ASOI_identifier", HFILL }},
     { &hf_acse_rLRQ_user_information,
       { "user-information", "acse.user_information",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "RLRQ-apdu/user-information", HFILL }},
+        "acse.Association_data", HFILL }},
     { &hf_acse_rLRE_reason,
       { "reason", "acse.reason",
         FT_INT32, BASE_DEC, VALS(acse_Release_response_reason_vals), 0,
-        "RLRE-apdu/reason", HFILL }},
+        "acse.Release_response_reason", HFILL }},
     { &hf_acse_rLRE_user_information,
       { "user-information", "acse.user_information",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "RLRE-apdu/user-information", HFILL }},
+        "acse.Association_data", HFILL }},
     { &hf_acse_abort_source,
       { "abort-source", "acse.abort_source",
         FT_UINT32, BASE_DEC, VALS(acse_ABRT_source_vals), 0,
-        "ABRT-apdu/abort-source", HFILL }},
+        "acse.ABRT_source", HFILL }},
     { &hf_acse_abort_diagnostic,
       { "abort-diagnostic", "acse.abort_diagnostic",
         FT_UINT32, BASE_DEC, VALS(acse_ABRT_diagnostic_vals), 0,
-        "ABRT-apdu/abort-diagnostic", HFILL }},
+        "acse.ABRT_diagnostic", HFILL }},
     { &hf_acse_aBRT_user_information,
       { "user-information", "acse.user_information",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ABRT-apdu/user-information", HFILL }},
+        "acse.Association_data", HFILL }},
     { &hf_acse_a_user_data,
       { "a-user-data", "acse.a_user_data",
         FT_UINT32, BASE_DEC, VALS(acse_User_Data_vals), 0,
-        "A-DT-apdu/a-user-data", HFILL }},
+        "acse.User_Data", HFILL }},
     { &hf_acse_aCRQ_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "ACRQ-apdu/aSO-context-name", HFILL }},
+        "acse.T_ACRQ_aSO_context_name", HFILL }},
     { &hf_acse_user_information,
       { "user-information", "acse.user_information",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "", HFILL }},
+        "acse.User_information", HFILL }},
     { &hf_acse_aSO_context_name,
       { "aSO-context-name", "acse.aSO_context_name",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ACRP-apdu/aSO-context-name", HFILL }},
+        "acse.T_ACRP_aSO_context_name", HFILL }},
     { &hf_acse_ap_title_form1,
       { "ap-title-form1", "acse.ap_title_form1",
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
-        "AP-title/ap-title-form1", HFILL }},
+        "acse.AP_title_form1", HFILL }},
     { &hf_acse_ap_title_form2,
       { "ap-title-form2", "acse.ap_title_form2",
         FT_OID, BASE_NONE, NULL, 0,
-        "AP-title/ap-title-form2", HFILL }},
+        "acse.AP_title_form2", HFILL }},
     { &hf_acse_ap_title_form3,
       { "ap-title-form3", "acse.ap_title_form3",
         FT_STRING, BASE_NONE, NULL, 0,
-        "AP-title/ap-title-form3", HFILL }},
+        "acse.AP_title_form3", HFILL }},
     { &hf_acse_aso_qualifier_form1,
       { "aso-qualifier-form1", "acse.aso_qualifier_form1",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ASO-qualifier/aso-qualifier-form1", HFILL }},
+        "acse.ASO_qualifier_form1", HFILL }},
     { &hf_acse_aso_qualifier_form2,
       { "aso-qualifier-form2", "acse.aso_qualifier_form2",
         FT_INT32, BASE_DEC, NULL, 0,
-        "ASO-qualifier/aso-qualifier-form2", HFILL }},
+        "acse.ASO_qualifier_form2", HFILL }},
     { &hf_acse_aso_qualifier_form3,
       { "aso-qualifier-form3", "acse.aso_qualifier_form3",
         FT_STRING, BASE_NONE, NULL, 0,
-        "ASO-qualifier/aso-qualifier-form3", HFILL }},
+        "acse.ASO_qualifier_form3", HFILL }},
     { &hf_acse_ae_title_form1,
       { "ae-title-form1", "acse.ae_title_form1",
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
-        "AE-title/ae-title-form1", HFILL }},
+        "acse.AE_title_form1", HFILL }},
     { &hf_acse_ae_title_form2,
       { "ae-title-form2", "acse.ae_title_form2",
         FT_OID, BASE_NONE, NULL, 0,
-        "AE-title/ae-title-form2", HFILL }},
+        "acse.AE_title_form2", HFILL }},
     { &hf_acse_ASOI_tag_item,
       { "Item", "acse.ASOI_tag_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "ASOI-tag/_item", HFILL }},
+        "acse.ASOI_tag_item", HFILL }},
     { &hf_acse_qualifier,
       { "qualifier", "acse.qualifier",
         FT_UINT32, BASE_DEC, VALS(acse_ASO_qualifier_vals), 0,
-        "ASOI-tag/_item/qualifier", HFILL }},
+        "acse.ASO_qualifier", HFILL }},
     { &hf_acse_identifier,
       { "identifier", "acse.identifier",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "ASOI-tag/_item/identifier", HFILL }},
+        "acse.ASOI_identifier", HFILL }},
     { &hf_acse_ASO_context_name_list_item,
       { "Item", "acse.ASO_context_name_list_item",
         FT_OID, BASE_NONE, NULL, 0,
-        "ASO-context-name-list/_item", HFILL }},
+        "acse.ASO_context_name", HFILL }},
     { &hf_acse_context_list,
       { "context-list", "acse.context_list",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Syntactic-context-list/context-list", HFILL }},
+        "acse.Context_list", HFILL }},
     { &hf_acse_default_contact_list,
       { "default-contact-list", "acse.default_contact_list",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Syntactic-context-list/default-contact-list", HFILL }},
+        "acse.Default_Context_List", HFILL }},
     { &hf_acse_Context_list_item,
       { "Item", "acse.Context_list_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Context-list/_item", HFILL }},
+        "acse.Context_list_item", HFILL }},
     { &hf_acse_pci,
       { "pci", "acse.pci",
         FT_INT32, BASE_DEC, NULL, 0,
-        "Context-list/_item/pci", HFILL }},
+        "acse.Presentation_context_identifier", HFILL }},
     { &hf_acse_abstract_syntax,
       { "abstract-syntax", "acse.abstract_syntax",
         FT_OID, BASE_NONE, NULL, 0,
-        "Context-list/_item/abstract-syntax", HFILL }},
+        "acse.Abstract_syntax_name", HFILL }},
     { &hf_acse_transfer_syntaxes,
       { "transfer-syntaxes", "acse.transfer_syntaxes",
         FT_UINT32, BASE_DEC, NULL, 0,
-        "Context-list/_item/transfer-syntaxes", HFILL }},
+        "acse.SEQUENCE_OF_TransferSyntaxName", HFILL }},
     { &hf_acse_transfer_syntaxes_item,
       { "Item", "acse.transfer_syntaxes_item",
         FT_OID, BASE_NONE, NULL, 0,
-        "Context-list/_item/transfer-syntaxes/_item", HFILL }},
+        "acse.TransferSyntaxName", HFILL }},
     { &hf_acse_Default_Context_List_item,
       { "Item", "acse.Default_Context_List_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Default-Context-List/_item", HFILL }},
+        "acse.Default_Context_List_item", HFILL }},
     { &hf_acse_abstract_syntax_name,
       { "abstract-syntax-name", "acse.abstract_syntax_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "Default-Context-List/_item/abstract-syntax-name", HFILL }},
+        "acse.Abstract_syntax_name", HFILL }},
     { &hf_acse_transfer_syntax_name,
       { "transfer-syntax-name", "acse.transfer_syntax_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "", HFILL }},
+        "acse.TransferSyntaxName", HFILL }},
     { &hf_acse_P_context_result_list_item,
       { "Item", "acse.P_context_result_list_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "P-context-result-list/_item", HFILL }},
+        "acse.P_context_result_list_item", HFILL }},
     { &hf_acse_pcontext_result,
       { "result", "acse.result",
         FT_INT32, BASE_DEC, VALS(acse_Result_vals), 0,
-        "P-context-result-list/_item/result", HFILL }},
+        "acse.Result", HFILL }},
     { &hf_acse_concrete_syntax_name,
       { "concrete-syntax-name", "acse.concrete_syntax_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "P-context-result-list/_item/concrete-syntax-name", HFILL }},
+        "acse.Concrete_syntax_name", HFILL }},
     { &hf_acse_provider_reason,
       { "provider-reason", "acse.provider_reason",
         FT_INT32, BASE_DEC, VALS(acse_T_provider_reason_vals), 0,
-        "P-context-result-list/_item/provider-reason", HFILL }},
+        "acse.T_provider_reason", HFILL }},
     { &hf_acse_acse_service_user,
       { "acse-service-user", "acse.acse_service_user",
         FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_user_vals), 0,
-        "Associate-source-diagnostic/acse-service-user", HFILL }},
+        "acse.T_acse_service_user", HFILL }},
     { &hf_acse_acse_service_provider,
       { "acse-service-provider", "acse.acse_service_provider",
         FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_provider_vals), 0,
-        "Associate-source-diagnostic/acse-service-provider", HFILL }},
+        "acse.T_acse_service_provider", HFILL }},
     { &hf_acse_Association_data_item,
       { "Item", "acse.Association_data_item",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Association-data/_item", HFILL }},
+        "acse.EXTERNAL", HFILL }},
     { &hf_acse_simply_encoded_data,
       { "simply-encoded-data", "acse.simply_encoded_data",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "User-Data/simply-encoded-data", HFILL }},
+        "acse.Simply_encoded_data", HFILL }},
     { &hf_acse_fully_encoded_data,
       { "fully-encoded-data", "acse.fully_encoded_data",
         FT_NONE, BASE_NONE, NULL, 0,
-        "User-Data/fully-encoded-data", HFILL }},
+        "acse.PDV_list", HFILL }},
     { &hf_acse_presentation_context_identifier,
       { "presentation-context-identifier", "acse.presentation_context_identifier",
         FT_INT32, BASE_DEC, NULL, 0,
-        "PDV-list/presentation-context-identifier", HFILL }},
+        "acse.Presentation_context_identifier", HFILL }},
     { &hf_acse_presentation_data_values,
       { "presentation-data-values", "acse.presentation_data_values",
         FT_UINT32, BASE_DEC, VALS(acse_T_presentation_data_values_vals), 0,
-        "PDV-list/presentation-data-values", HFILL }},
+        "acse.T_presentation_data_values", HFILL }},
     { &hf_acse_simple_ASN1_type,
       { "simple-ASN1-type", "acse.simple_ASN1_type",
         FT_NONE, BASE_NONE, NULL, 0,
-        "PDV-list/presentation-data-values/simple-ASN1-type", HFILL }},
+        "acse.T_simple_ASN1_type", HFILL }},
     { &hf_acse_other_mechanism_name,
       { "other-mechanism-name", "acse.other_mechanism_name",
         FT_OID, BASE_NONE, NULL, 0,
-        "Authentication-value-other/other-mechanism-name", HFILL }},
+        "acse.T_other_mechanism_name", HFILL }},
     { &hf_acse_other_mechanism_value,
       { "other-mechanism-value", "acse.other_mechanism_value",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Authentication-value-other/other-mechanism-value", HFILL }},
+        "acse.T_other_mechanism_value", HFILL }},
     { &hf_acse_charstring,
       { "charstring", "acse.charstring",
         FT_STRING, BASE_NONE, NULL, 0,
-        "Authentication-value/charstring", HFILL }},
+        "acse.GraphicString", HFILL }},
     { &hf_acse_bitstring,
       { "bitstring", "acse.bitstring",
         FT_BYTES, BASE_HEX, NULL, 0,
-        "Authentication-value/bitstring", HFILL }},
+        "acse.BIT_STRING", HFILL }},
     { &hf_acse_external,
       { "external", "acse.external",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Authentication-value/external", HFILL }},
+        "acse.EXTERNAL", HFILL }},
     { &hf_acse_other,
       { "other", "acse.other",
         FT_NONE, BASE_NONE, NULL, 0,
-        "Authentication-value/other", HFILL }},
+        "acse.Authentication_value_other", HFILL }},
     { &hf_acse_T_AARQ_protocol_version_version1,
       { "version1", "acse.version1",
         FT_BOOLEAN, 8, NULL, 0x80,