Postfix FT_NONE fields with "_element" string to reduce number of incompatible filter...
authorPascal Quantin <pascal.quantin@gmail.com>
Mon, 27 May 2013 20:26:49 +0000 (20:26 -0000)
committerPascal Quantin <pascal.quantin@gmail.com>
Mon, 27 May 2013 20:26:49 +0000 (20:26 -0000)
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402

svn path=/trunk/; revision=49599

95 files changed:
epan/dissectors/packet-HI2Operations.c
epan/dissectors/packet-acp133.c
epan/dissectors/packet-acse.c
epan/dissectors/packet-ansi_map.c
epan/dissectors/packet-ansi_tcap.c
epan/dissectors/packet-c1222.c
epan/dissectors/packet-camel.c
epan/dissectors/packet-cdt.c
epan/dissectors/packet-charging_ase.c
epan/dissectors/packet-cmip.c
epan/dissectors/packet-cmp.c
epan/dissectors/packet-cms.c
epan/dissectors/packet-credssp.c
epan/dissectors/packet-crmf.c
epan/dissectors/packet-dap.c
epan/dissectors/packet-disp.c
epan/dissectors/packet-dop.c
epan/dissectors/packet-dsp.c
epan/dissectors/packet-ess.c
epan/dissectors/packet-ftam.c
epan/dissectors/packet-gnm.c
epan/dissectors/packet-goose.c
epan/dissectors/packet-gprscdr.c
epan/dissectors/packet-gsm_map.c
epan/dissectors/packet-h225.c
epan/dissectors/packet-h235.c
epan/dissectors/packet-h245.c
epan/dissectors/packet-h248.c
epan/dissectors/packet-h282.c
epan/dissectors/packet-h283.c
epan/dissectors/packet-h323.c
epan/dissectors/packet-h450-ros.c
epan/dissectors/packet-h450.c
epan/dissectors/packet-h460.c
epan/dissectors/packet-h501.c
epan/dissectors/packet-hnbap.c
epan/dissectors/packet-idmp.c
epan/dissectors/packet-inap.c
epan/dissectors/packet-isdn-sup.c
epan/dissectors/packet-lcsap.c
epan/dissectors/packet-ldap.c
epan/dissectors/packet-logotypecertextn.c
epan/dissectors/packet-lpp.c
epan/dissectors/packet-lppa.c
epan/dissectors/packet-lppe.c
epan/dissectors/packet-lte-rrc.c
epan/dissectors/packet-m3ap.c
epan/dissectors/packet-mms.c
epan/dissectors/packet-nbap.c
epan/dissectors/packet-ocsp.c
epan/dissectors/packet-p1.c
epan/dissectors/packet-p22.c
epan/dissectors/packet-p7.c
epan/dissectors/packet-p772.c
epan/dissectors/packet-pcap.c
epan/dissectors/packet-pkcs1.c
epan/dissectors/packet-pkcs12.c
epan/dissectors/packet-pkinit.c
epan/dissectors/packet-pkix1explicit.c
epan/dissectors/packet-pkix1implicit.c
epan/dissectors/packet-pkixac.c
epan/dissectors/packet-pkixproxy.c
epan/dissectors/packet-pkixqualified.c
epan/dissectors/packet-pkixtsp.c
epan/dissectors/packet-pres.c
epan/dissectors/packet-q932-ros.c
epan/dissectors/packet-q932.c
epan/dissectors/packet-qsig.c
epan/dissectors/packet-ranap.c
epan/dissectors/packet-rnsap.c
epan/dissectors/packet-ros.c
epan/dissectors/packet-rrc.c
epan/dissectors/packet-rrlp.c
epan/dissectors/packet-rtse.c
epan/dissectors/packet-rua.c
epan/dissectors/packet-s1ap.c
epan/dissectors/packet-sabp.c
epan/dissectors/packet-sbc-ap.c
epan/dissectors/packet-smrse.c
epan/dissectors/packet-snmp.c
epan/dissectors/packet-spnego.c
epan/dissectors/packet-sv.c
epan/dissectors/packet-t124.c
epan/dissectors/packet-t124.h
epan/dissectors/packet-t125.c
epan/dissectors/packet-t38.c
epan/dissectors/packet-tcap.c
epan/dissectors/packet-tetra.c
epan/dissectors/packet-ulp.c
epan/dissectors/packet-x2ap.c
epan/dissectors/packet-x509af.c
epan/dissectors/packet-x509ce.c
epan/dissectors/packet-x509if.c
epan/dissectors/packet-x509sat.c
tools/asn2wrs.py

index 55a74dde7bcaed37bfdef22563603186738a8e0a..b1eefb6c4d7bd1a225f5c6cc43f0d02ad14946ed 100644 (file)
@@ -3793,19 +3793,19 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_IRIContent_vals), 0,
         NULL, HFILL }},
     { &hf_HI2Operations_iRI_Begin_record,
-      { "iRI-Begin-record", "HI2Operations.iRI_Begin_record",
+      { "iRI-Begin-record", "HI2Operations.iRI_Begin_record_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRI_Parameters", HFILL }},
     { &hf_HI2Operations_iRI_End_record,
-      { "iRI-End-record", "HI2Operations.iRI_End_record",
+      { "iRI-End-record", "HI2Operations.iRI_End_record_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRI_Parameters", HFILL }},
     { &hf_HI2Operations_iRI_Continue_record,
-      { "iRI-Continue-record", "HI2Operations.iRI_Continue_record",
+      { "iRI-Continue-record", "HI2Operations.iRI_Continue_record_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRI_Parameters", HFILL }},
     { &hf_HI2Operations_iRI_Report_record,
-      { "iRI-Report-record", "HI2Operations.iRI_Report_record",
+      { "iRI-Report-record", "HI2Operations.iRI_Report_record_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRI_Parameters", HFILL }},
     { &hf_HI2Operations_domainID,
@@ -3821,7 +3821,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_communicationIdentifier,
-      { "communicationIdentifier", "HI2Operations.communicationIdentifier",
+      { "communicationIdentifier", "HI2Operations.communicationIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_timeStamp,
@@ -3845,7 +3845,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_3", HFILL }},
     { &hf_HI2Operations_locationOfTheTarget,
-      { "locationOfTheTarget", "HI2Operations.locationOfTheTarget",
+      { "locationOfTheTarget", "HI2Operations.locationOfTheTarget_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Location", HFILL }},
     { &hf_HI2Operations_partyInformation,
@@ -3853,19 +3853,19 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_10_OF_PartyInformation", HFILL }},
     { &hf_HI2Operations_partyInformation_item,
-      { "PartyInformation", "HI2Operations.PartyInformation",
+      { "PartyInformation", "HI2Operations.PartyInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_callContentLinkInformation,
-      { "callContentLinkInformation", "HI2Operations.callContentLinkInformation",
+      { "callContentLinkInformation", "HI2Operations.callContentLinkInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_cCLink1Characteristics,
-      { "cCLink1Characteristics", "HI2Operations.cCLink1Characteristics",
+      { "cCLink1Characteristics", "HI2Operations.cCLink1Characteristics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallContentLinkCharacteristics", HFILL }},
     { &hf_HI2Operations_cCLink2Characteristics,
-      { "cCLink2Characteristics", "HI2Operations.cCLink2Characteristics",
+      { "cCLink2Characteristics", "HI2Operations.cCLink2Characteristics_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallContentLinkCharacteristics", HFILL }},
     { &hf_HI2Operations_release_Reason_Of_Intercepted_Call,
@@ -3877,11 +3877,11 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_nature_Of_The_intercepted_call_vals), 0,
         NULL, HFILL }},
     { &hf_HI2Operations_serverCenterAddress,
-      { "serverCenterAddress", "HI2Operations.serverCenterAddress",
+      { "serverCenterAddress", "HI2Operations.serverCenterAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyInformation", HFILL }},
     { &hf_HI2Operations_sMS,
-      { "sMS", "HI2Operations.sMS",
+      { "sMS", "HI2Operations.sMS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SMS_report", HFILL }},
     { &hf_HI2Operations_cC_Link_Identifier,
@@ -3917,7 +3917,7 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_UmtsQos_vals), 0,
         "UmtsQos", HFILL }},
     { &hf_HI2Operations_networkIdentifier,
-      { "networkIdentifier", "HI2Operations.networkIdentifier",
+      { "networkIdentifier", "HI2Operations.networkIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Network_Identifier", HFILL }},
     { &hf_HI2Operations_sMSOriginatingAddress,
@@ -3945,7 +3945,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_5_17", HFILL }},
     { &hf_HI2Operations_tARGETACTIVITYMONITOR,
-      { "tARGETACTIVITYMONITOR", "HI2Operations.tARGETACTIVITYMONITOR",
+      { "tARGETACTIVITYMONITOR", "HI2Operations.tARGETACTIVITYMONITOR_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TARGETACTIVITYMONITOR_1", HFILL }},
     { &hf_HI2Operations_ldiEvent,
@@ -3957,23 +3957,23 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_CorrelationValues_vals), 0,
         "CorrelationValues", HFILL }},
     { &hf_HI2Operations_tARGETACTIVITYMONITORind,
-      { "tARGETACTIVITYMONITORind", "HI2Operations.tARGETACTIVITYMONITORind",
+      { "tARGETACTIVITYMONITORind", "HI2Operations.tARGETACTIVITYMONITORind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_tARGETCOMMSMONITORind,
-      { "tARGETCOMMSMONITORind", "HI2Operations.tARGETCOMMSMONITORind",
+      { "tARGETCOMMSMONITORind", "HI2Operations.tARGETCOMMSMONITORind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_tTRAFFICind,
-      { "tTRAFFICind", "HI2Operations.tTRAFFICind",
+      { "tTRAFFICind", "HI2Operations.tTRAFFICind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_cTTRAFFICind,
-      { "cTTRAFFICind", "HI2Operations.cTTRAFFICind",
+      { "cTTRAFFICind", "HI2Operations.cTTRAFFICind_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_national_HI2_ASN1parameters,
-      { "national-HI2-ASN1parameters", "HI2Operations.national_HI2_ASN1parameters",
+      { "national-HI2-ASN1parameters", "HI2Operations.national_HI2_ASN1parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_communication_Identity_Number,
@@ -3981,7 +3981,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_8", HFILL }},
     { &hf_HI2Operations_network_Identifier,
-      { "network-Identifier", "HI2Operations.network_Identifier",
+      { "network-Identifier", "HI2Operations.network_Identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_operator_Identifier,
@@ -4009,11 +4009,11 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_25", HFILL }},
     { &hf_HI2Operations_iP_Address,
-      { "iP-Address", "HI2Operations.iP_Address",
+      { "iP-Address", "HI2Operations.iP_Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IPAddress", HFILL }},
     { &hf_HI2Operations_localTime,
-      { "localTime", "HI2Operations.localTime",
+      { "localTime", "HI2Operations.localTime_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LocalTimeStamp", HFILL }},
     { &hf_HI2Operations_utcTime,
@@ -4033,7 +4033,7 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_T_party_Qualifier_vals), 0,
         NULL, HFILL }},
     { &hf_HI2Operations_partyIdentity,
-      { "partyIdentity", "HI2Operations.partyIdentity",
+      { "partyIdentity", "HI2Operations.partyIdentity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_imei,
@@ -4069,15 +4069,15 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_HI2Operations_services_Information,
-      { "services-Information", "HI2Operations.services_Information",
+      { "services-Information", "HI2Operations.services_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_supplementary_Services_Information,
-      { "supplementary-Services-Information", "HI2Operations.supplementary_Services_Information",
+      { "supplementary-Services-Information", "HI2Operations.supplementary_Services_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Supplementary_Services", HFILL }},
     { &hf_HI2Operations_services_Data_Information,
-      { "services-Data-Information", "HI2Operations.services_Data_Information",
+      { "services-Data-Information", "HI2Operations.services_Data_Information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_iSUP_Format,
@@ -4125,7 +4125,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_6", HFILL }},
     { &hf_HI2Operations_ms_Loc,
-      { "ms-Loc", "HI2Operations.ms_Loc",
+      { "ms-Loc", "HI2Operations.ms_Loc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_mcc,
@@ -4149,7 +4149,7 @@ void proto_register_HI2Operations(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_HI2Operations_geoCoordinates,
-      { "geoCoordinates", "HI2Operations.geoCoordinates",
+      { "geoCoordinates", "HI2Operations.geoCoordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_latitude,
@@ -4169,7 +4169,7 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_359", HFILL }},
     { &hf_HI2Operations_utmCoordinates,
-      { "utmCoordinates", "HI2Operations.utmCoordinates",
+      { "utmCoordinates", "HI2Operations.utmCoordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_utm_East,
@@ -4181,7 +4181,7 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "PrintableString_SIZE_7", HFILL }},
     { &hf_HI2Operations_utmRefCoordinates,
-      { "utmRefCoordinates", "HI2Operations.utmRefCoordinates",
+      { "utmRefCoordinates", "HI2Operations.utmRefCoordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_utmref_string,
@@ -4193,11 +4193,11 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_HI2Operations_point,
-      { "point", "HI2Operations.point",
+      { "point", "HI2Operations.point_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_Point", HFILL }},
     { &hf_HI2Operations_pointWithUnCertainty,
-      { "pointWithUnCertainty", "HI2Operations.pointWithUnCertainty",
+      { "pointWithUnCertainty", "HI2Operations.pointWithUnCertainty_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GA_PointWithUnCertainty", HFILL }},
     { &hf_HI2Operations_polygon,
@@ -4217,7 +4217,7 @@ void proto_register_HI2Operations(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER_M8388608_8388607", HFILL }},
     { &hf_HI2Operations_geographicalCoordinates,
-      { "geographicalCoordinates", "HI2Operations.geographicalCoordinates",
+      { "geographicalCoordinates", "HI2Operations.geographicalCoordinates_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_uncertaintyCode,
@@ -4225,7 +4225,7 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_127", HFILL }},
     { &hf_HI2Operations_GA_Polygon_item,
-      { "GA-Polygon item", "HI2Operations.GA_Polygon_item",
+      { "GA-Polygon item", "HI2Operations.GA_Polygon_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_cCLink_State,
@@ -4269,7 +4269,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_256", HFILL }},
     { &hf_HI2Operations_standard_Supplementary_Services,
-      { "standard-Supplementary-Services", "HI2Operations.standard_Supplementary_Services",
+      { "standard-Supplementary-Services", "HI2Operations.standard_Supplementary_Services_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_non_Standard_Supplementary_Services,
@@ -4369,7 +4369,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_256", HFILL }},
     { &hf_HI2Operations_sMS_Contents,
-      { "sMS-Contents", "HI2Operations.sMS_Contents",
+      { "sMS-Contents", "HI2Operations.sMS_Contents_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_initiator,
@@ -4393,7 +4393,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1_256", HFILL }},
     { &hf_HI2Operations_gPRS_parameters,
-      { "gPRS-parameters", "HI2Operations.gPRS_parameters",
+      { "gPRS-parameters", "HI2Operations.gPRS_parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_pDP_address_allocated_to_the_target,
@@ -4409,7 +4409,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_2", HFILL }},
     { &hf_HI2Operations_ipAddress,
-      { "ipAddress", "HI2Operations.ipAddress",
+      { "ipAddress", "HI2Operations.ipAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_x25Address,
@@ -4449,7 +4449,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_HI2Operations_iri_to_CC,
-      { "iri-to-CC", "HI2Operations.iri_to_CC",
+      { "iri-to-CC", "HI2Operations.iri_to_CC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRI_to_CC_Correlation", HFILL }},
     { &hf_HI2Operations_iri_to_iri,
@@ -4457,11 +4457,11 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "IRI_to_IRI_Correlation", HFILL }},
     { &hf_HI2Operations_both_IRI_CC,
-      { "both-IRI-CC", "HI2Operations.both_IRI_CC",
+      { "both-IRI-CC", "HI2Operations.both_IRI_CC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_iri_CC,
-      { "iri-CC", "HI2Operations.iri_CC",
+      { "iri-CC", "HI2Operations.iri_CC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IRI_to_CC_Correlation", HFILL }},
     { &hf_HI2Operations_iri_IRI,
@@ -4525,7 +4525,7 @@ void proto_register_HI2Operations(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_HI2Operations_cdcPdu,
-      { "cdcPdu", "HI2Operations.cdcPdu",
+      { "cdcPdu", "HI2Operations.cdcPdu_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_geodeticData,
@@ -4545,79 +4545,79 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_Message_vals), 0,
         NULL, HFILL }},
     { &hf_HI2Operations_answer,
-      { "answer", "HI2Operations.answer",
+      { "answer", "HI2Operations.answer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_ccclose,
-      { "ccclose", "HI2Operations.ccclose",
+      { "ccclose", "HI2Operations.ccclose_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_ccopen,
-      { "ccopen", "HI2Operations.ccopen",
+      { "ccopen", "HI2Operations.ccopen_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_reserved0,
-      { "reserved0", "HI2Operations.reserved0",
+      { "reserved0", "HI2Operations.reserved0_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_origination,
-      { "origination", "HI2Operations.origination",
+      { "origination", "HI2Operations.origination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_reserved1,
-      { "reserved1", "HI2Operations.reserved1",
+      { "reserved1", "HI2Operations.reserved1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_redirection,
-      { "redirection", "HI2Operations.redirection",
+      { "redirection", "HI2Operations.redirection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_release,
-      { "release", "HI2Operations.release",
+      { "release", "HI2Operations.release_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_reserved2,
-      { "reserved2", "HI2Operations.reserved2",
+      { "reserved2", "HI2Operations.reserved2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_terminationattempt,
-      { "terminationattempt", "HI2Operations.terminationattempt",
+      { "terminationattempt", "HI2Operations.terminationattempt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_reserved,
-      { "reserved", "HI2Operations.reserved",
+      { "reserved", "HI2Operations.reserved_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_ccchange,
-      { "ccchange", "HI2Operations.ccchange",
+      { "ccchange", "HI2Operations.ccchange_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_reserved3,
-      { "reserved3", "HI2Operations.reserved3",
+      { "reserved3", "HI2Operations.reserved3_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_reserved4,
-      { "reserved4", "HI2Operations.reserved4",
+      { "reserved4", "HI2Operations.reserved4_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_reserved5,
-      { "reserved5", "HI2Operations.reserved5",
+      { "reserved5", "HI2Operations.reserved5_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_networksignal,
-      { "networksignal", "HI2Operations.networksignal",
+      { "networksignal", "HI2Operations.networksignal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_subjectsignal,
-      { "subjectsignal", "HI2Operations.subjectsignal",
+      { "subjectsignal", "HI2Operations.subjectsignal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_mediareport,
-      { "mediareport", "HI2Operations.mediareport",
+      { "mediareport", "HI2Operations.mediareport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_serviceinstance,
-      { "serviceinstance", "HI2Operations.serviceinstance",
+      { "serviceinstance", "HI2Operations.serviceinstance_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_caseId,
@@ -4633,11 +4633,11 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_callId,
-      { "callId", "HI2Operations.callId",
+      { "callId", "HI2Operations.callId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_answering,
-      { "answering", "HI2Operations.answering",
+      { "answering", "HI2Operations.answering_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyId", HFILL }},
     { &hf_HI2Operations_cCCId,
@@ -4669,7 +4669,7 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CallId", HFILL }},
     { &hf_HI2Operations_ccOpenTime_item,
-      { "CallId", "HI2Operations.CallId",
+      { "CallId", "HI2Operations.CallId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_alertingSignal,
@@ -4681,7 +4681,7 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_AudibleSignal_vals), 0,
         "AudibleSignal", HFILL }},
     { &hf_HI2Operations_terminalDisplayInfo,
-      { "terminalDisplayInfo", "HI2Operations.terminalDisplayInfo",
+      { "terminalDisplayInfo", "HI2Operations.terminalDisplayInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_other,
@@ -4689,11 +4689,11 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_128_", HFILL }},
     { &hf_HI2Operations_calling,
-      { "calling", "HI2Operations.calling",
+      { "calling", "HI2Operations.calling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyId", HFILL }},
     { &hf_HI2Operations_called,
-      { "called", "HI2Operations.called",
+      { "called", "HI2Operations.called_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyId", HFILL }},
     { &hf_HI2Operations_input,
@@ -4713,23 +4713,23 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_old,
-      { "old", "HI2Operations.old",
+      { "old", "HI2Operations.old_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallId", HFILL }},
     { &hf_HI2Operations_redirectedto,
-      { "redirectedto", "HI2Operations.redirectedto",
+      { "redirectedto", "HI2Operations.redirectedto_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyId", HFILL }},
     { &hf_HI2Operations_new,
-      { "new", "HI2Operations.new",
+      { "new", "HI2Operations.new_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallId", HFILL }},
     { &hf_HI2Operations_redirectedfrom,
-      { "redirectedfrom", "HI2Operations.redirectedfrom",
+      { "redirectedfrom", "HI2Operations.redirectedfrom_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyId", HFILL }},
     { &hf_HI2Operations_relatedCallId,
-      { "relatedCallId", "HI2Operations.relatedCallId",
+      { "relatedCallId", "HI2Operations.relatedCallId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CallId", HFILL }},
     { &hf_HI2Operations_serviceName,
@@ -4737,15 +4737,15 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_128_", HFILL }},
     { &hf_HI2Operations_firstCallCalling,
-      { "firstCallCalling", "HI2Operations.firstCallCalling",
+      { "firstCallCalling", "HI2Operations.firstCallCalling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyId", HFILL }},
     { &hf_HI2Operations_secondCallCalling,
-      { "secondCallCalling", "HI2Operations.secondCallCalling",
+      { "secondCallCalling", "HI2Operations.secondCallCalling_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyId", HFILL }},
     { &hf_HI2Operations_signal,
-      { "signal", "HI2Operations.signal",
+      { "signal", "HI2Operations.signal_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_switchhookFlash,
@@ -4765,7 +4765,7 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_128_", HFILL }},
     { &hf_HI2Operations_redirectedFromInfo,
-      { "redirectedFromInfo", "HI2Operations.redirectedFromInfo",
+      { "redirectedFromInfo", "HI2Operations.redirectedFromInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_sequencenumber,
@@ -4781,7 +4781,7 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_20_", HFILL }},
     { &hf_HI2Operations_sepCCCpair,
-      { "sepCCCpair", "HI2Operations.sepCCCpair",
+      { "sepCCCpair", "HI2Operations.sepCCCpair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_sepXmitCCC,
@@ -4801,11 +4801,11 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_15_", HFILL }},
     { &hf_HI2Operations_reserved6,
-      { "reserved6", "HI2Operations.reserved6",
+      { "reserved6", "HI2Operations.reserved6_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_reserved7,
-      { "reserved7", "HI2Operations.reserved7",
+      { "reserved7", "HI2Operations.reserved7_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_ipAddress_01,
@@ -4813,7 +4813,7 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_32_", HFILL }},
     { &hf_HI2Operations_reserved8,
-      { "reserved8", "HI2Operations.reserved8",
+      { "reserved8", "HI2Operations.reserved8_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_trunkId,
@@ -4821,7 +4821,7 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_32_", HFILL }},
     { &hf_HI2Operations_reserved9,
-      { "reserved9", "HI2Operations.reserved9",
+      { "reserved9", "HI2Operations.reserved9_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_genericAddress,
@@ -4845,11 +4845,11 @@ void proto_register_HI2Operations(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "VisibleString_SIZE_1_32_", HFILL }},
     { &hf_HI2Operations_lastRedirecting,
-      { "lastRedirecting", "HI2Operations.lastRedirecting",
+      { "lastRedirecting", "HI2Operations.lastRedirecting_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyId", HFILL }},
     { &hf_HI2Operations_originalCalled,
-      { "originalCalled", "HI2Operations.originalCalled",
+      { "originalCalled", "HI2Operations.originalCalled_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PartyId", HFILL }},
     { &hf_HI2Operations_numRedirections,
@@ -4901,11 +4901,11 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_LocationType_en301040_vals), 0,
         "LocationType_en301040", HFILL }},
     { &hf_HI2Operations_targetAction,
-      { "targetAction", "HI2Operations.targetAction",
+      { "targetAction", "HI2Operations.targetAction_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActivityType", HFILL }},
     { &hf_HI2Operations_supplementaryTargetaddress,
-      { "supplementaryTargetaddress", "HI2Operations.supplementaryTargetaddress",
+      { "supplementaryTargetaddress", "HI2Operations.supplementaryTargetaddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddressType", HFILL }},
     { &hf_HI2Operations_cotargetaddress,
@@ -4913,7 +4913,7 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AddressType", HFILL }},
     { &hf_HI2Operations_cotargetaddress_item,
-      { "AddressType", "HI2Operations.AddressType",
+      { "AddressType", "HI2Operations.AddressType_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_HI2Operations_cotargetlocation,
@@ -4969,7 +4969,7 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_SSType_vals), 0,
         NULL, HFILL }},
     { &hf_HI2Operations_tSI,
-      { "tSI", "HI2Operations.tSI",
+      { "tSI", "HI2Operations.tSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TSIType", HFILL }},
     { &hf_HI2Operations_supplementaryAddress,
@@ -4981,7 +4981,7 @@ void proto_register_HI2Operations(void) {
         FT_UINT32, BASE_DEC, VALS(HI2Operations_TETRAAddressType_vals), 0,
         NULL, HFILL }},
     { &hf_HI2Operations_tETRAaddress,
-      { "tETRAaddress", "HI2Operations.tETRAaddress",
+      { "tETRAaddress", "HI2Operations.tETRAaddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TSIType", HFILL }},
     { &hf_HI2Operations_pISNaddress,
@@ -5005,7 +5005,7 @@ void proto_register_HI2Operations(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "TEIType", HFILL }},
     { &hf_HI2Operations_mSLoc,
-      { "mSLoc", "HI2Operations.mSLoc",
+      { "mSLoc", "HI2Operations.mSLoc_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TETRACGIType", HFILL }},
     { &hf_HI2Operations_lSLoc,
index 8b87c387f10b6d37e41a0d00684a31212e7dc572..9e7836181c23f17769f3ce73013972dcdf0b6194 100644 (file)
@@ -1242,7 +1242,7 @@ void proto_register_acp133(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_MonthlyUKMs_PDU,
-      { "MonthlyUKMs", "acp133.MonthlyUKMs",
+      { "MonthlyUKMs", "acp133.MonthlyUKMs_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_MsgProtocolInfoCapability_PDU,
@@ -1274,15 +1274,15 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, VALS(acp133_DLSubmitPermission_vals), 0,
         NULL, HFILL }},
     { &hf_acp133_DLPolicy_PDU,
-      { "DLPolicy", "acp133.DLPolicy",
+      { "DLPolicy", "acp133.DLPolicy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_AddressCapabilities_PDU,
-      { "AddressCapabilities", "acp133.AddressCapabilities",
+      { "AddressCapabilities", "acp133.AddressCapabilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_Capability_PDU,
-      { "Capability", "acp133.Capability",
+      { "Capability", "acp133.Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_Addressees_item,
@@ -1294,11 +1294,11 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_UKMEntry", HFILL }},
     { &hf_acp133_ukm_entries_item,
-      { "UKMEntry", "acp133.UKMEntry",
+      { "UKMEntry", "acp133.UKMEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_algorithm_identifier,
-      { "algorithm-identifier", "acp133.algorithm_identifier",
+      { "algorithm-identifier", "acp133.algorithm_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_acp133_encrypted,
@@ -1314,7 +1314,7 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, VALS(x509sat_DirectoryString_vals), 0,
         "DirectoryString", HFILL }},
     { &hf_acp133_ri_parameters_deprecated,
-      { "ri-parameters-deprecated", "acp133.ri_parameters_deprecated",
+      { "ri-parameters-deprecated", "acp133.ri_parameters_deprecated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RIParametersDeprecated", HFILL }},
     { &hf_acp133_rI,
@@ -1338,7 +1338,7 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, VALS(acp133_Classification_vals), 0,
         NULL, HFILL }},
     { &hf_acp133_tag,
-      { "tag", "acp133.tag",
+      { "tag", "acp133.tag_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PairwiseTag", HFILL }},
     { &hf_acp133_ukm,
@@ -1358,7 +1358,7 @@ void proto_register_acp133(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "UTCTime", HFILL }},
     { &hf_acp133_none,
-      { "none", "acp133.none",
+      { "none", "acp133.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_insteadOf,
@@ -1378,15 +1378,15 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_individual,
-      { "individual", "acp133.individual",
+      { "individual", "acp133.individual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORName", HFILL }},
     { &hf_acp133_member_of_dl,
-      { "member-of-dl", "acp133.member_of_dl",
+      { "member-of-dl", "acp133.member_of_dl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORName", HFILL }},
     { &hf_acp133_pattern_match,
-      { "pattern-match", "acp133.pattern_match",
+      { "pattern-match", "acp133.pattern_match_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORNamePattern", HFILL }},
     { &hf_acp133_member_of_group,
@@ -1446,11 +1446,11 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, VALS(acp133_T_requested_delivery_method_vals), 0,
         NULL, HFILL }},
     { &hf_acp133_unchanged,
-      { "unchanged", "acp133.unchanged",
+      { "unchanged", "acp133.unchanged_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_removed,
-      { "removed", "acp133.removed",
+      { "removed", "acp133.removed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_replaced,
@@ -1462,7 +1462,7 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AlgorithmInformation", HFILL }},
     { &hf_acp133_token_encryption_algorithm_preference_item,
-      { "AlgorithmInformation", "acp133.AlgorithmInformation",
+      { "AlgorithmInformation", "acp133.AlgorithmInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_token_signature_algorithm_preference,
@@ -1470,15 +1470,15 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_AlgorithmInformation", HFILL }},
     { &hf_acp133_token_signature_algorithm_preference_item,
-      { "AlgorithmInformation", "acp133.AlgorithmInformation",
+      { "AlgorithmInformation", "acp133.AlgorithmInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_originator_certificate_selector,
-      { "originator-certificate-selector", "acp133.originator_certificate_selector",
+      { "originator-certificate-selector", "acp133.originator_certificate_selector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_acp133_recipient_certificate_selector,
-      { "recipient-certificate-selector", "acp133.recipient_certificate_selector",
+      { "recipient-certificate-selector", "acp133.recipient_certificate_selector_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateAssertion", HFILL }},
     { &hf_acp133_description,
@@ -1486,7 +1486,7 @@ void proto_register_acp133(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralString", HFILL }},
     { &hf_acp133_address,
-      { "address", "acp133.address",
+      { "address", "acp133.address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ORAddress", HFILL }},
     { &hf_acp133_capabilities,
@@ -1494,7 +1494,7 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Capability", HFILL }},
     { &hf_acp133_capabilities_item,
-      { "Capability", "acp133.Capability",
+      { "Capability", "acp133.Capability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acp133_content_types,
@@ -1510,7 +1510,7 @@ void proto_register_acp133(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "ContentLength", HFILL }},
     { &hf_acp133_encoded_information_types_constraints,
-      { "encoded-information-types-constraints", "acp133.encoded_information_types_constraints",
+      { "encoded-information-types-constraints", "acp133.encoded_information_types_constraints_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncodedInformationTypesConstraints", HFILL }},
     { &hf_acp133_security_labels,
index 1a3fe9f58efbe5741c98a889daf71a69f7bc1d65..2a86dd0d7ea4a1a48fed1bd02c32bda91357ac7a 100644 (file)
@@ -1826,7 +1826,7 @@ void proto_register_acse(void) {
         FT_UINT32, BASE_DEC, VALS(acse_T_encoding_vals), 0,
         NULL, HFILL }},
     { &hf_acse_single_ASN1_type,
-      { "single-ASN1-type", "acse.single_ASN1_type",
+      { "single-ASN1-type", "acse.single_ASN1_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_octet_aligned,
@@ -1838,35 +1838,35 @@ void proto_register_acse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_acse_aarq,
-      { "aarq", "acse.aarq",
+      { "aarq", "acse.aarq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AARQ_apdu", HFILL }},
     { &hf_acse_aare,
-      { "aare", "acse.aare",
+      { "aare", "acse.aare_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AARE_apdu", HFILL }},
     { &hf_acse_rlrq,
-      { "rlrq", "acse.rlrq",
+      { "rlrq", "acse.rlrq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLRQ_apdu", HFILL }},
     { &hf_acse_rlre,
-      { "rlre", "acse.rlre",
+      { "rlre", "acse.rlre_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RLRE_apdu", HFILL }},
     { &hf_acse_abrt,
-      { "abrt", "acse.abrt",
+      { "abrt", "acse.abrt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ABRT_apdu", HFILL }},
     { &hf_acse_adt,
-      { "adt", "acse.adt",
+      { "adt", "acse.adt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "A_DT_apdu", HFILL }},
     { &hf_acse_acrq,
-      { "acrq", "acse.acrq",
+      { "acrq", "acse.acrq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ACRQ_apdu", HFILL }},
     { &hf_acse_acrp,
-      { "acrp", "acse.acrp",
+      { "acrp", "acse.acrp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ACRP_apdu", HFILL }},
     { &hf_acse_aARQ_protocol_version,
@@ -2082,7 +2082,7 @@ void proto_register_acse(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_ASOI_tag_item,
-      { "ASOI-tag item", "acse.ASOI_tag_item",
+      { "ASOI-tag item", "acse.ASOI_tag_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_qualifier,
@@ -2106,7 +2106,7 @@ void proto_register_acse(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Default_Context_List", HFILL }},
     { &hf_acse_Context_list_item,
-      { "Context-list item", "acse.Context_list_item",
+      { "Context-list item", "acse.Context_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_pci,
@@ -2126,7 +2126,7 @@ void proto_register_acse(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_Default_Context_List_item,
-      { "Default-Context-List item", "acse.Default_Context_List_item",
+      { "Default-Context-List item", "acse.Default_Context_List_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_abstract_syntax_name,
@@ -2138,7 +2138,7 @@ void proto_register_acse(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "TransferSyntaxName", HFILL }},
     { &hf_acse_P_context_result_list_item,
-      { "P-context-result-list item", "acse.P_context_result_list_item",
+      { "P-context-result-list item", "acse.P_context_result_list_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_pcontext_result,
@@ -2162,7 +2162,7 @@ void proto_register_acse(void) {
         FT_UINT32, BASE_DEC, VALS(acse_T_acse_service_provider_vals), 0,
         NULL, HFILL }},
     { &hf_acse_Association_data_item,
-      { "Association-data", "acse.EXTERNALt",
+      { "Association-data", "acse.EXTERNALt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNALt", HFILL }},
     { &hf_acse_simply_encoded_data,
@@ -2170,7 +2170,7 @@ void proto_register_acse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_fully_encoded_data,
-      { "fully-encoded-data", "acse.fully_encoded_data",
+      { "fully-encoded-data", "acse.fully_encoded_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PDV_list", HFILL }},
     { &hf_acse_presentation_context_identifier,
@@ -2182,7 +2182,7 @@ void proto_register_acse(void) {
         FT_UINT32, BASE_DEC, VALS(acse_T_presentation_data_values_vals), 0,
         NULL, HFILL }},
     { &hf_acse_simple_ASN1_type,
-      { "simple-ASN1-type", "acse.simple_ASN1_type",
+      { "simple-ASN1-type", "acse.simple_ASN1_type_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_pDVList_octet_aligned,
@@ -2194,7 +2194,7 @@ void proto_register_acse(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_other_mechanism_value,
-      { "other-mechanism-value", "acse.other_mechanism_value",
+      { "other-mechanism-value", "acse.other_mechanism_value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_acse_charstring,
@@ -2206,11 +2206,11 @@ void proto_register_acse(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_acse_external,
-      { "external", "acse.external",
+      { "external", "acse.external_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNALt", HFILL }},
     { &hf_acse_other,
-      { "other", "acse.other",
+      { "other", "acse.other_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Authentication_value_other", HFILL }},
     { &hf_acse_T_AARQ_protocol_version_version1,
index 3326a97de9e327b7c37825495e009914f7abe600..dcad43094fd25c4ecc201285d25cfab070fc5236 100644 (file)
@@ -17175,7 +17175,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mobileStationMIN,
-      { "mobileStationMIN", "ansi_map.mobileStationMIN",
+      { "mobileStationMIN", "ansi_map.mobileStationMIN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mscid,
@@ -17195,7 +17195,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_senderIdentificationNumber,
-      { "senderIdentificationNumber", "ansi_map.senderIdentificationNumber",
+      { "senderIdentificationNumber", "ansi_map.senderIdentificationNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sharedSecretData,
@@ -17215,11 +17215,11 @@ void proto_register_ansi_map(void) {
         FT_UINT32, BASE_DEC, VALS(ansi_map_UpdateCount_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_map_interMSCCircuitID,
-      { "interMSCCircuitID", "ansi_map.interMSCCircuitID",
+      { "interMSCCircuitID", "ansi_map.interMSCCircuitID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mobileIdentificationNumber,
-      { "mobileIdentificationNumber", "ansi_map.mobileIdentificationNumber",
+      { "mobileIdentificationNumber", "ansi_map.mobileIdentificationNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_countUpdateReport,
@@ -17275,7 +17275,7 @@ void proto_register_ansi_map(void) {
         FT_UINT8, BASE_DEC, VALS(ansi_map_ControlChannelMode_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_map_digits,
-      { "digits", "ansi_map.digits",
+      { "digits", "ansi_map.digits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_pc_ssn,
@@ -17299,11 +17299,11 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_analogRedirectRecord,
-      { "analogRedirectRecord", "ansi_map.analogRedirectRecord",
+      { "analogRedirectRecord", "ansi_map.analogRedirectRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdmaRedirectRecord,
-      { "cdmaRedirectRecord", "ansi_map.cdmaRedirectRecord",
+      { "cdmaRedirectRecord", "ansi_map.cdmaRedirectRecord_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_dataKey,
@@ -17403,7 +17403,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdma2000HandoffInvokeIOSData,
-      { "cdma2000HandoffInvokeIOSData", "ansi_map.cdma2000HandoffInvokeIOSData",
+      { "cdma2000HandoffInvokeIOSData", "ansi_map.cdma2000HandoffInvokeIOSData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdmaBandClassList,
@@ -17523,7 +17523,7 @@ void proto_register_ansi_map(void) {
         FT_UINT8, BASE_DEC, VALS(ansi_map_BSMCStatus_vals), 0x03,
         NULL, HFILL }},
     { &hf_ansi_map_cdma2000HandoffResponseIOSData,
-      { "cdma2000HandoffResponseIOSData", "ansi_map.cdma2000HandoffResponseIOSData",
+      { "cdma2000HandoffResponseIOSData", "ansi_map.cdma2000HandoffResponseIOSData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdmaCodeChannelList,
@@ -17571,11 +17571,11 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mobileDirectoryNumber,
-      { "mobileDirectoryNumber", "ansi_map.mobileDirectoryNumber",
+      { "mobileDirectoryNumber", "ansi_map.mobileDirectoryNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mSCIdentificationNumber,
-      { "mSCIdentificationNumber", "ansi_map.mSCIdentificationNumber",
+      { "mSCIdentificationNumber", "ansi_map.mSCIdentificationNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oneTimeFeatureIndicator,
@@ -17599,19 +17599,19 @@ void proto_register_ansi_map(void) {
         FT_UINT8, BASE_DEC|BASE_EXT_STRING|BASE_EXT_STRING, &ansi_map_ActionCode_vals_ext, 0,
         NULL, HFILL }},
     { &hf_ansi_map_announcementList,
-      { "announcementList", "ansi_map.announcementList",
+      { "announcementList", "ansi_map.announcementList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_callingPartyNumberString1,
-      { "callingPartyNumberString1", "ansi_map.callingPartyNumberString1",
+      { "callingPartyNumberString1", "ansi_map.callingPartyNumberString1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_callingPartyNumberString2,
-      { "callingPartyNumberString2", "ansi_map.callingPartyNumberString2",
+      { "callingPartyNumberString2", "ansi_map.callingPartyNumberString2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_digits_Destination,
-      { "digits-Destination", "ansi_map.digits_Destination",
+      { "digits-Destination", "ansi_map.digits_Destination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_ansi_map_displayText,
@@ -17683,7 +17683,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_triggerAddressList,
-      { "triggerAddressList", "ansi_map.triggerAddressList",
+      { "triggerAddressList", "ansi_map.triggerAddressList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_emergencyServicesRoutingDigits,
@@ -17691,7 +17691,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_targetCellIDList,
-      { "targetCellIDList", "ansi_map.targetCellIDList",
+      { "targetCellIDList", "ansi_map.targetCellIDList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_signalQuality,
@@ -17787,7 +17787,7 @@ void proto_register_ansi_map(void) {
         FT_UINT8, BASE_DEC, VALS(ansi_map_PagingFrameClass_vals), 0x03,
         NULL, HFILL }},
     { &hf_ansi_map_pSID_RSIDList,
-      { "pSID-RSIDList", "ansi_map.pSID_RSIDList",
+      { "pSID-RSIDList", "ansi_map.pSID_RSIDList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_randc,
@@ -17819,7 +17819,7 @@ void proto_register_ansi_map(void) {
         FT_UINT32, BASE_DEC|BASE_EXT_STRING, &ansi_map_TriggerType_vals_ext, 0,
         NULL, HFILL }},
     { &hf_ansi_map_winCapability,
-      { "winCapability", "ansi_map.winCapability",
+      { "winCapability", "ansi_map.winCapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_callingPartyCategory,
@@ -17831,11 +17831,11 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_digits_carrier,
-      { "digits-carrier", "ansi_map.digits_carrier",
+      { "digits-carrier", "ansi_map.digits_carrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_ansi_map_digits_dest,
-      { "digits-dest", "ansi_map.digits_dest",
+      { "digits-dest", "ansi_map.digits_dest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_ansi_map_dmh_ServiceID,
@@ -17855,7 +17855,7 @@ void proto_register_ansi_map(void) {
         FT_UINT8, BASE_DEC, VALS(ansi_map_ServicesResult_ppr_vals), 0x03,
         NULL, HFILL }},
     { &hf_ansi_map_sms_MessageWaitingIndicator,
-      { "sms-MessageWaitingIndicator", "ansi_map.sms_MessageWaitingIndicator",
+      { "sms-MessageWaitingIndicator", "ansi_map.sms_MessageWaitingIndicator_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_originationTriggers,
@@ -17899,7 +17899,7 @@ void proto_register_ansi_map(void) {
         FT_UINT8, BASE_DEC, VALS(ansi_map_GeographicAuthorization_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_map_meidValidated,
-      { "meidValidated", "ansi_map.meidValidated",
+      { "meidValidated", "ansi_map.meidValidated_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mobilePositionCapability,
@@ -17983,7 +17983,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sms_Address,
-      { "sms-Address", "ansi_map.sms_Address",
+      { "sms-Address", "ansi_map.sms_Address_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mpcAddress,
@@ -17991,11 +17991,11 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mpcAddressList,
-      { "mpcAddressList", "ansi_map.mpcAddressList",
+      { "mpcAddressList", "ansi_map.mpcAddressList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_digits_Carrier,
-      { "digits-Carrier", "ansi_map.digits_Carrier",
+      { "digits-Carrier", "ansi_map.digits_Carrier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_ansi_map_digitCollectionControl,
@@ -18027,11 +18027,11 @@ void proto_register_ansi_map(void) {
         FT_UINT8, BASE_DEC, VALS(ansi_map_SMS_ChargeIndicator_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_map_sms_DestinationAddress,
-      { "sms-DestinationAddress", "ansi_map.sms_DestinationAddress",
+      { "sms-DestinationAddress", "ansi_map.sms_DestinationAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sms_OriginalDestinationAddress,
-      { "sms-OriginalDestinationAddress", "ansi_map.sms_OriginalDestinationAddress",
+      { "sms-OriginalDestinationAddress", "ansi_map.sms_OriginalDestinationAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sms_OriginalDestinationSubaddress,
@@ -18039,7 +18039,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sms_OriginalOriginatingAddress,
-      { "sms-OriginalOriginatingAddress", "ansi_map.sms_OriginalOriginatingAddress",
+      { "sms-OriginalOriginatingAddress", "ansi_map.sms_OriginalOriginatingAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sms_OriginalOriginatingSubaddress,
@@ -18047,7 +18047,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sms_OriginatingAddress,
-      { "sms-OriginatingAddress", "ansi_map.sms_OriginatingAddress",
+      { "sms-OriginatingAddress", "ansi_map.sms_OriginatingAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sms_CauseCode,
@@ -18067,7 +18067,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_newlyAssignedMIN,
-      { "newlyAssignedMIN", "ansi_map.newlyAssignedMIN",
+      { "newlyAssignedMIN", "ansi_map.newlyAssignedMIN_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_newMINExtension,
@@ -18087,7 +18087,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_temporaryReferenceNumber,
-      { "temporaryReferenceNumber", "ansi_map.temporaryReferenceNumber",
+      { "temporaryReferenceNumber", "ansi_map.temporaryReferenceNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mobileStationMSID,
@@ -18179,7 +18179,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_executeScript,
-      { "executeScript", "ansi_map.executeScript",
+      { "executeScript", "ansi_map.executeScript_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_scriptResult,
@@ -18303,7 +18303,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_positionInformation,
-      { "positionInformation", "ansi_map.positionInformation",
+      { "positionInformation", "ansi_map.positionInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_controlType,
@@ -18391,7 +18391,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_CDMACodeChannelList_item,
-      { "CDMACodeChannelInformation", "ansi_map.CDMACodeChannelInformation",
+      { "CDMACodeChannelInformation", "ansi_map.CDMACodeChannelInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdmaPilotStrength,
@@ -18403,7 +18403,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_CDMATargetMAHOList_item,
-      { "CDMATargetMAHOInformation", "ansi_map.CDMATargetMAHOInformation",
+      { "CDMATargetMAHOInformation", "ansi_map.CDMATargetMAHOInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdmaSignalQuality,
@@ -18411,11 +18411,11 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_CDMATargetMeasurementList_item,
-      { "CDMATargetMeasurementInformation", "ansi_map.CDMATargetMeasurementInformation",
+      { "CDMATargetMeasurementInformation", "ansi_map.CDMATargetMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_TargetMeasurementList_item,
-      { "TargetMeasurementInformation", "ansi_map.TargetMeasurementInformation",
+      { "TargetMeasurementInformation", "ansi_map.TargetMeasurementInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_TerminationList_item,
@@ -18423,19 +18423,19 @@ void proto_register_ansi_map(void) {
         FT_UINT32, BASE_DEC, VALS(ansi_map_TerminationList_item_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_map_intersystemTermination,
-      { "intersystemTermination", "ansi_map.intersystemTermination",
+      { "intersystemTermination", "ansi_map.intersystemTermination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_localTermination,
-      { "localTermination", "ansi_map.localTermination",
+      { "localTermination", "ansi_map.localTermination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_pstnTermination,
-      { "pstnTermination", "ansi_map.pstnTermination",
+      { "pstnTermination", "ansi_map.pstnTermination_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_CDMABandClassList_item,
-      { "CDMABandClassInformation", "ansi_map.CDMABandClassInformation",
+      { "CDMABandClassInformation", "ansi_map.CDMABandClassInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_CDMAServiceOptionList_item,
@@ -18463,15 +18463,15 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_CDMAConnectionReferenceList_item,
-      { "CDMAConnectionReferenceList item", "ansi_map.CDMAConnectionReferenceList_item",
+      { "CDMAConnectionReferenceList item", "ansi_map.CDMAConnectionReferenceList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdmaConnectionReferenceInformation,
-      { "cdmaConnectionReferenceInformation", "ansi_map.cdmaConnectionReferenceInformation",
+      { "cdmaConnectionReferenceInformation", "ansi_map.cdmaConnectionReferenceInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdmaConnectionReferenceInformation2,
-      { "cdmaConnectionReferenceInformation2", "ansi_map.cdmaConnectionReferenceInformation2",
+      { "cdmaConnectionReferenceInformation2", "ansi_map.cdmaConnectionReferenceInformation2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CDMAConnectionReferenceInformation", HFILL }},
     { &hf_ansi_map_analogRedirectInfo,
@@ -18479,7 +18479,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_CDMAChannelNumberList_item,
-      { "CDMAChannelNumberList item", "ansi_map.CDMAChannelNumberList_item",
+      { "CDMAChannelNumberList item", "ansi_map.CDMAChannelNumberList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdmaChannelNumber,
@@ -18507,15 +18507,15 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_DataAccessElementList_item,
-      { "DataAccessElementList item", "ansi_map.DataAccessElementList_item",
+      { "DataAccessElementList item", "ansi_map.DataAccessElementList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_dataAccessElement1,
-      { "dataAccessElement1", "ansi_map.dataAccessElement1",
+      { "dataAccessElement1", "ansi_map.dataAccessElement1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DataAccessElement", HFILL }},
     { &hf_ansi_map_dataAccessElement2,
-      { "dataAccessElement2", "ansi_map.dataAccessElement2",
+      { "dataAccessElement2", "ansi_map.dataAccessElement2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DataAccessElement", HFILL }},
     { &hf_ansi_map_dataResult,
@@ -18523,7 +18523,7 @@ void proto_register_ansi_map(void) {
         FT_UINT32, BASE_DEC, VALS(ansi_map_DataResult_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_map_DataUpdateResultList_item,
-      { "DataUpdateResult", "ansi_map.DataUpdateResult",
+      { "DataUpdateResult", "ansi_map.DataUpdateResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_globalTitle,
@@ -18547,7 +18547,7 @@ void proto_register_ansi_map(void) {
         FT_UINT32, BASE_DEC, VALS(ansi_map_AllOrNone_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_map_ModificationRequestList_item,
-      { "ModificationRequest", "ansi_map.ModificationRequest",
+      { "ModificationRequest", "ansi_map.ModificationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_serviceDataResultList,
@@ -18559,7 +18559,7 @@ void proto_register_ansi_map(void) {
         FT_UINT32, BASE_DEC, VALS(ansi_map_ModificationResult_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_map_ServiceDataAccessElementList_item,
-      { "ServiceDataAccessElement", "ansi_map.ServiceDataAccessElement",
+      { "ServiceDataAccessElement", "ansi_map.ServiceDataAccessElement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_dataUpdateResultList,
@@ -18567,15 +18567,15 @@ void proto_register_ansi_map(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_ServiceDataResultList_item,
-      { "ServiceDataResult", "ansi_map.ServiceDataResult",
+      { "ServiceDataResult", "ansi_map.ServiceDataResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_triggerList,
-      { "triggerList", "ansi_map.triggerList",
+      { "triggerList", "ansi_map.triggerList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_triggerListOpt,
-      { "triggerListOpt", "ansi_map.triggerListOpt",
+      { "triggerListOpt", "ansi_map.triggerListOpt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TriggerList", HFILL }},
     { &hf_ansi_map_wIN_TriggerList,
@@ -18591,7 +18591,7 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_CallRecoveryIDList_item,
-      { "CallRecoveryID", "ansi_map.CallRecoveryID",
+      { "CallRecoveryID", "ansi_map.CallRecoveryID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_generalizedTime,
@@ -18623,7 +18623,7 @@ void proto_register_ansi_map(void) {
         FT_UINT32, BASE_DEC, VALS(ansi_map_ServiceManagementSystemGapInterval_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_map_CDMAPSMMList_item,
-      { "CDMAPSMMList item", "ansi_map.CDMAPSMMList_item",
+      { "CDMAPSMMList item", "ansi_map.CDMAPSMMList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_cdmaTargetMAHOList2,
@@ -18639,671 +18639,671 @@ void proto_register_ansi_map(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffMeasurementRequest,
-      { "handoffMeasurementRequest", "ansi_map.handoffMeasurementRequest",
+      { "handoffMeasurementRequest", "ansi_map.handoffMeasurementRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_facilitiesDirective,
-      { "facilitiesDirective", "ansi_map.facilitiesDirective",
+      { "facilitiesDirective", "ansi_map.facilitiesDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffBack,
-      { "handoffBack", "ansi_map.handoffBack",
+      { "handoffBack", "ansi_map.handoffBack_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_facilitiesRelease,
-      { "facilitiesRelease", "ansi_map.facilitiesRelease",
+      { "facilitiesRelease", "ansi_map.facilitiesRelease_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_qualificationRequest,
-      { "qualificationRequest", "ansi_map.qualificationRequest",
+      { "qualificationRequest", "ansi_map.qualificationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_qualificationDirective,
-      { "qualificationDirective", "ansi_map.qualificationDirective",
+      { "qualificationDirective", "ansi_map.qualificationDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_blocking,
-      { "blocking", "ansi_map.blocking",
+      { "blocking", "ansi_map.blocking_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_unblocking,
-      { "unblocking", "ansi_map.unblocking",
+      { "unblocking", "ansi_map.unblocking_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_resetCircuit,
-      { "resetCircuit", "ansi_map.resetCircuit",
+      { "resetCircuit", "ansi_map.resetCircuit_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_trunkTest,
-      { "trunkTest", "ansi_map.trunkTest",
+      { "trunkTest", "ansi_map.trunkTest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_trunkTestDisconnect,
-      { "trunkTestDisconnect", "ansi_map.trunkTestDisconnect",
+      { "trunkTestDisconnect", "ansi_map.trunkTestDisconnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_registrationNotification,
-      { "registrationNotification", "ansi_map.registrationNotification",
+      { "registrationNotification", "ansi_map.registrationNotification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_registrationCancellation,
-      { "registrationCancellation", "ansi_map.registrationCancellation",
+      { "registrationCancellation", "ansi_map.registrationCancellation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_locationRequest,
-      { "locationRequest", "ansi_map.locationRequest",
+      { "locationRequest", "ansi_map.locationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_routingRequest,
-      { "routingRequest", "ansi_map.routingRequest",
+      { "routingRequest", "ansi_map.routingRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_featureRequest,
-      { "featureRequest", "ansi_map.featureRequest",
+      { "featureRequest", "ansi_map.featureRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_unreliableRoamerDataDirective,
-      { "unreliableRoamerDataDirective", "ansi_map.unreliableRoamerDataDirective",
+      { "unreliableRoamerDataDirective", "ansi_map.unreliableRoamerDataDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_mSInactive,
-      { "mSInactive", "ansi_map.mSInactive",
+      { "mSInactive", "ansi_map.mSInactive_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_transferToNumberRequest,
-      { "transferToNumberRequest", "ansi_map.transferToNumberRequest",
+      { "transferToNumberRequest", "ansi_map.transferToNumberRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_redirectionRequest,
-      { "redirectionRequest", "ansi_map.redirectionRequest",
+      { "redirectionRequest", "ansi_map.redirectionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffToThird,
-      { "handoffToThird", "ansi_map.handoffToThird",
+      { "handoffToThird", "ansi_map.handoffToThird_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_flashRequest,
-      { "flashRequest", "ansi_map.flashRequest",
+      { "flashRequest", "ansi_map.flashRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationDirective,
-      { "authenticationDirective", "ansi_map.authenticationDirective",
+      { "authenticationDirective", "ansi_map.authenticationDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationRequest,
-      { "authenticationRequest", "ansi_map.authenticationRequest",
+      { "authenticationRequest", "ansi_map.authenticationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_baseStationChallenge,
-      { "baseStationChallenge", "ansi_map.baseStationChallenge",
+      { "baseStationChallenge", "ansi_map.baseStationChallenge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationFailureReport,
-      { "authenticationFailureReport", "ansi_map.authenticationFailureReport",
+      { "authenticationFailureReport", "ansi_map.authenticationFailureReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_countRequest,
-      { "countRequest", "ansi_map.countRequest",
+      { "countRequest", "ansi_map.countRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemPage,
-      { "interSystemPage", "ansi_map.interSystemPage",
+      { "interSystemPage", "ansi_map.interSystemPage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_unsolicitedResponse,
-      { "unsolicitedResponse", "ansi_map.unsolicitedResponse",
+      { "unsolicitedResponse", "ansi_map.unsolicitedResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_bulkDeregistration,
-      { "bulkDeregistration", "ansi_map.bulkDeregistration",
+      { "bulkDeregistration", "ansi_map.bulkDeregistration_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffMeasurementRequest2,
-      { "handoffMeasurementRequest2", "ansi_map.handoffMeasurementRequest2",
+      { "handoffMeasurementRequest2", "ansi_map.handoffMeasurementRequest2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_facilitiesDirective2,
-      { "facilitiesDirective2", "ansi_map.facilitiesDirective2",
+      { "facilitiesDirective2", "ansi_map.facilitiesDirective2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffBack2,
-      { "handoffBack2", "ansi_map.handoffBack2",
+      { "handoffBack2", "ansi_map.handoffBack2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffToThird2,
-      { "handoffToThird2", "ansi_map.handoffToThird2",
+      { "handoffToThird2", "ansi_map.handoffToThird2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationDirectiveForward,
-      { "authenticationDirectiveForward", "ansi_map.authenticationDirectiveForward",
+      { "authenticationDirectiveForward", "ansi_map.authenticationDirectiveForward_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationStatusReport,
-      { "authenticationStatusReport", "ansi_map.authenticationStatusReport",
+      { "authenticationStatusReport", "ansi_map.authenticationStatusReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_informationDirective,
-      { "informationDirective", "ansi_map.informationDirective",
+      { "informationDirective", "ansi_map.informationDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_informationForward,
-      { "informationForward", "ansi_map.informationForward",
+      { "informationForward", "ansi_map.informationForward_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemAnswer,
-      { "interSystemAnswer", "ansi_map.interSystemAnswer",
+      { "interSystemAnswer", "ansi_map.interSystemAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemPage2,
-      { "interSystemPage2", "ansi_map.interSystemPage2",
+      { "interSystemPage2", "ansi_map.interSystemPage2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemSetup,
-      { "interSystemSetup", "ansi_map.interSystemSetup",
+      { "interSystemSetup", "ansi_map.interSystemSetup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_originationRequest,
-      { "originationRequest", "ansi_map.originationRequest",
+      { "originationRequest", "ansi_map.originationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_randomVariableRequest,
-      { "randomVariableRequest", "ansi_map.randomVariableRequest",
+      { "randomVariableRequest", "ansi_map.randomVariableRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_redirectionDirective,
-      { "redirectionDirective", "ansi_map.redirectionDirective",
+      { "redirectionDirective", "ansi_map.redirectionDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_remoteUserInteractionDirective,
-      { "remoteUserInteractionDirective", "ansi_map.remoteUserInteractionDirective",
+      { "remoteUserInteractionDirective", "ansi_map.remoteUserInteractionDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryBackward,
-      { "sMSDeliveryBackward", "ansi_map.sMSDeliveryBackward",
+      { "sMSDeliveryBackward", "ansi_map.sMSDeliveryBackward_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryForward,
-      { "sMSDeliveryForward", "ansi_map.sMSDeliveryForward",
+      { "sMSDeliveryForward", "ansi_map.sMSDeliveryForward_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryPointToPoint,
-      { "sMSDeliveryPointToPoint", "ansi_map.sMSDeliveryPointToPoint",
+      { "sMSDeliveryPointToPoint", "ansi_map.sMSDeliveryPointToPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSNotification,
-      { "sMSNotification", "ansi_map.sMSNotification",
+      { "sMSNotification", "ansi_map.sMSNotification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSRequest,
-      { "sMSRequest", "ansi_map.sMSRequest",
+      { "sMSRequest", "ansi_map.sMSRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oTASPRequest,
-      { "oTASPRequest", "ansi_map.oTASPRequest",
+      { "oTASPRequest", "ansi_map.oTASPRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_changeFacilities,
-      { "changeFacilities", "ansi_map.changeFacilities",
+      { "changeFacilities", "ansi_map.changeFacilities_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_changeService,
-      { "changeService", "ansi_map.changeService",
+      { "changeService", "ansi_map.changeService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_parameterRequest,
-      { "parameterRequest", "ansi_map.parameterRequest",
+      { "parameterRequest", "ansi_map.parameterRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_tMSIDirective,
-      { "tMSIDirective", "ansi_map.tMSIDirective",
+      { "tMSIDirective", "ansi_map.tMSIDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_numberPortabilityRequest,
-      { "numberPortabilityRequest", "ansi_map.numberPortabilityRequest",
+      { "numberPortabilityRequest", "ansi_map.numberPortabilityRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_serviceRequest,
-      { "serviceRequest", "ansi_map.serviceRequest",
+      { "serviceRequest", "ansi_map.serviceRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_analyzedInformation,
-      { "analyzedInformation", "ansi_map.analyzedInformation",
+      { "analyzedInformation", "ansi_map.analyzedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_connectionFailureReport,
-      { "connectionFailureReport", "ansi_map.connectionFailureReport",
+      { "connectionFailureReport", "ansi_map.connectionFailureReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_connectResource,
-      { "connectResource", "ansi_map.connectResource",
+      { "connectResource", "ansi_map.connectResource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_facilitySelectedAndAvailable,
-      { "facilitySelectedAndAvailable", "ansi_map.facilitySelectedAndAvailable",
+      { "facilitySelectedAndAvailable", "ansi_map.facilitySelectedAndAvailable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_modify,
-      { "modify", "ansi_map.modify",
+      { "modify", "ansi_map.modify_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_search,
-      { "search", "ansi_map.search",
+      { "search", "ansi_map.search_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_seizeResource,
-      { "seizeResource", "ansi_map.seizeResource",
+      { "seizeResource", "ansi_map.seizeResource_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sRFDirective,
-      { "sRFDirective", "ansi_map.sRFDirective",
+      { "sRFDirective", "ansi_map.sRFDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_tBusy,
-      { "tBusy", "ansi_map.tBusy",
+      { "tBusy", "ansi_map.tBusy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_tNoAnswer,
-      { "tNoAnswer", "ansi_map.tNoAnswer",
+      { "tNoAnswer", "ansi_map.tNoAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_smsDeliveryPointToPointAck,
-      { "smsDeliveryPointToPointAck", "ansi_map.smsDeliveryPointToPointAck",
+      { "smsDeliveryPointToPointAck", "ansi_map.smsDeliveryPointToPointAck_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_messageDirective,
-      { "messageDirective", "ansi_map.messageDirective",
+      { "messageDirective", "ansi_map.messageDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_bulkDisconnection,
-      { "bulkDisconnection", "ansi_map.bulkDisconnection",
+      { "bulkDisconnection", "ansi_map.bulkDisconnection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_callControlDirective,
-      { "callControlDirective", "ansi_map.callControlDirective",
+      { "callControlDirective", "ansi_map.callControlDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oAnswer,
-      { "oAnswer", "ansi_map.oAnswer",
+      { "oAnswer", "ansi_map.oAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oDisconnect,
-      { "oDisconnect", "ansi_map.oDisconnect",
+      { "oDisconnect", "ansi_map.oDisconnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_callRecoveryReport,
-      { "callRecoveryReport", "ansi_map.callRecoveryReport",
+      { "callRecoveryReport", "ansi_map.callRecoveryReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_tAnswer,
-      { "tAnswer", "ansi_map.tAnswer",
+      { "tAnswer", "ansi_map.tAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_tDisconnect,
-      { "tDisconnect", "ansi_map.tDisconnect",
+      { "tDisconnect", "ansi_map.tDisconnect_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_unreliableCallData,
-      { "unreliableCallData", "ansi_map.unreliableCallData",
+      { "unreliableCallData", "ansi_map.unreliableCallData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oCalledPartyBusy,
-      { "oCalledPartyBusy", "ansi_map.oCalledPartyBusy",
+      { "oCalledPartyBusy", "ansi_map.oCalledPartyBusy_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oNoAnswer,
-      { "oNoAnswer", "ansi_map.oNoAnswer",
+      { "oNoAnswer", "ansi_map.oNoAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_positionRequest,
-      { "positionRequest", "ansi_map.positionRequest",
+      { "positionRequest", "ansi_map.positionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_positionRequestForward,
-      { "positionRequestForward", "ansi_map.positionRequestForward",
+      { "positionRequestForward", "ansi_map.positionRequestForward_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_callTerminationReport,
-      { "callTerminationReport", "ansi_map.callTerminationReport",
+      { "callTerminationReport", "ansi_map.callTerminationReport_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_geoPositionRequest,
-      { "geoPositionRequest", "ansi_map.geoPositionRequest",
+      { "geoPositionRequest", "ansi_map.geoPositionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemPositionRequest,
-      { "interSystemPositionRequest", "ansi_map.interSystemPositionRequest",
+      { "interSystemPositionRequest", "ansi_map.interSystemPositionRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemPositionRequestForward,
-      { "interSystemPositionRequestForward", "ansi_map.interSystemPositionRequestForward",
+      { "interSystemPositionRequestForward", "ansi_map.interSystemPositionRequestForward_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_aCGDirective,
-      { "aCGDirective", "ansi_map.aCGDirective",
+      { "aCGDirective", "ansi_map.aCGDirective_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_roamerDatabaseVerificationRequest,
-      { "roamerDatabaseVerificationRequest", "ansi_map.roamerDatabaseVerificationRequest",
+      { "roamerDatabaseVerificationRequest", "ansi_map.roamerDatabaseVerificationRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_addService,
-      { "addService", "ansi_map.addService",
+      { "addService", "ansi_map.addService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_dropService,
-      { "dropService", "ansi_map.dropService",
+      { "dropService", "ansi_map.dropService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_lcsParameterRequest,
-      { "lcsParameterRequest", "ansi_map.lcsParameterRequest",
+      { "lcsParameterRequest", "ansi_map.lcsParameterRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_checkMEID,
-      { "checkMEID", "ansi_map.checkMEID",
+      { "checkMEID", "ansi_map.checkMEID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_positionEventNotification,
-      { "positionEventNotification", "ansi_map.positionEventNotification",
+      { "positionEventNotification", "ansi_map.positionEventNotification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_statusRequest,
-      { "statusRequest", "ansi_map.statusRequest",
+      { "statusRequest", "ansi_map.statusRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemSMSDeliveryPointToPoint,
-      { "interSystemSMSDeliveryPointToPoint", "ansi_map.interSystemSMSDeliveryPointToPoint",
+      { "interSystemSMSDeliveryPointToPoint", "ansi_map.interSystemSMSDeliveryPointToPoint_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_qualificationRequest2,
-      { "qualificationRequest2", "ansi_map.qualificationRequest2",
+      { "qualificationRequest2", "ansi_map.qualificationRequest2_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffMeasurementRequestRes,
-      { "handoffMeasurementRequestRes", "ansi_map.handoffMeasurementRequestRes",
+      { "handoffMeasurementRequestRes", "ansi_map.handoffMeasurementRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_facilitiesDirectiveRes,
-      { "facilitiesDirectiveRes", "ansi_map.facilitiesDirectiveRes",
+      { "facilitiesDirectiveRes", "ansi_map.facilitiesDirectiveRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffBackRes,
-      { "handoffBackRes", "ansi_map.handoffBackRes",
+      { "handoffBackRes", "ansi_map.handoffBackRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_facilitiesReleaseRes,
-      { "facilitiesReleaseRes", "ansi_map.facilitiesReleaseRes",
+      { "facilitiesReleaseRes", "ansi_map.facilitiesReleaseRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_qualificationDirectiveRes,
-      { "qualificationDirectiveRes", "ansi_map.qualificationDirectiveRes",
+      { "qualificationDirectiveRes", "ansi_map.qualificationDirectiveRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_qualificationRequestRes,
-      { "qualificationRequestRes", "ansi_map.qualificationRequestRes",
+      { "qualificationRequestRes", "ansi_map.qualificationRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_resetCircuitRes,
-      { "resetCircuitRes", "ansi_map.resetCircuitRes",
+      { "resetCircuitRes", "ansi_map.resetCircuitRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_registrationNotificationRes,
-      { "registrationNotificationRes", "ansi_map.registrationNotificationRes",
+      { "registrationNotificationRes", "ansi_map.registrationNotificationRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_registrationCancellationRes,
-      { "registrationCancellationRes", "ansi_map.registrationCancellationRes",
+      { "registrationCancellationRes", "ansi_map.registrationCancellationRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_locationRequestRes,
-      { "locationRequestRes", "ansi_map.locationRequestRes",
+      { "locationRequestRes", "ansi_map.locationRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_routingRequestRes,
-      { "routingRequestRes", "ansi_map.routingRequestRes",
+      { "routingRequestRes", "ansi_map.routingRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_featureRequestRes,
-      { "featureRequestRes", "ansi_map.featureRequestRes",
+      { "featureRequestRes", "ansi_map.featureRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_transferToNumberRequestRes,
-      { "transferToNumberRequestRes", "ansi_map.transferToNumberRequestRes",
+      { "transferToNumberRequestRes", "ansi_map.transferToNumberRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffToThirdRes,
-      { "handoffToThirdRes", "ansi_map.handoffToThirdRes",
+      { "handoffToThirdRes", "ansi_map.handoffToThirdRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationDirectiveRes,
-      { "authenticationDirectiveRes", "ansi_map.authenticationDirectiveRes",
+      { "authenticationDirectiveRes", "ansi_map.authenticationDirectiveRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationRequestRes,
-      { "authenticationRequestRes", "ansi_map.authenticationRequestRes",
+      { "authenticationRequestRes", "ansi_map.authenticationRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_baseStationChallengeRes,
-      { "baseStationChallengeRes", "ansi_map.baseStationChallengeRes",
+      { "baseStationChallengeRes", "ansi_map.baseStationChallengeRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationFailureReportRes,
-      { "authenticationFailureReportRes", "ansi_map.authenticationFailureReportRes",
+      { "authenticationFailureReportRes", "ansi_map.authenticationFailureReportRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_countRequestRes,
-      { "countRequestRes", "ansi_map.countRequestRes",
+      { "countRequestRes", "ansi_map.countRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemPageRes,
-      { "interSystemPageRes", "ansi_map.interSystemPageRes",
+      { "interSystemPageRes", "ansi_map.interSystemPageRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_unsolicitedResponseRes,
-      { "unsolicitedResponseRes", "ansi_map.unsolicitedResponseRes",
+      { "unsolicitedResponseRes", "ansi_map.unsolicitedResponseRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffMeasurementRequest2Res,
-      { "handoffMeasurementRequest2Res", "ansi_map.handoffMeasurementRequest2Res",
+      { "handoffMeasurementRequest2Res", "ansi_map.handoffMeasurementRequest2Res_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_facilitiesDirective2Res,
-      { "facilitiesDirective2Res", "ansi_map.facilitiesDirective2Res",
+      { "facilitiesDirective2Res", "ansi_map.facilitiesDirective2Res_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffBack2Res,
-      { "handoffBack2Res", "ansi_map.handoffBack2Res",
+      { "handoffBack2Res", "ansi_map.handoffBack2Res_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_handoffToThird2Res,
-      { "handoffToThird2Res", "ansi_map.handoffToThird2Res",
+      { "handoffToThird2Res", "ansi_map.handoffToThird2Res_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationDirectiveForwardRes,
-      { "authenticationDirectiveForwardRes", "ansi_map.authenticationDirectiveForwardRes",
+      { "authenticationDirectiveForwardRes", "ansi_map.authenticationDirectiveForwardRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_authenticationStatusReportRes,
-      { "authenticationStatusReportRes", "ansi_map.authenticationStatusReportRes",
+      { "authenticationStatusReportRes", "ansi_map.authenticationStatusReportRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_informationDirectiveRes,
-      { "informationDirectiveRes", "ansi_map.informationDirectiveRes",
+      { "informationDirectiveRes", "ansi_map.informationDirectiveRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_informationForwardRes,
-      { "informationForwardRes", "ansi_map.informationForwardRes",
+      { "informationForwardRes", "ansi_map.informationForwardRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemPage2Res,
-      { "interSystemPage2Res", "ansi_map.interSystemPage2Res",
+      { "interSystemPage2Res", "ansi_map.interSystemPage2Res_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemSetupRes,
-      { "interSystemSetupRes", "ansi_map.interSystemSetupRes",
+      { "interSystemSetupRes", "ansi_map.interSystemSetupRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_originationRequestRes,
-      { "originationRequestRes", "ansi_map.originationRequestRes",
+      { "originationRequestRes", "ansi_map.originationRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_randomVariableRequestRes,
-      { "randomVariableRequestRes", "ansi_map.randomVariableRequestRes",
+      { "randomVariableRequestRes", "ansi_map.randomVariableRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_remoteUserInteractionDirectiveRes,
-      { "remoteUserInteractionDirectiveRes", "ansi_map.remoteUserInteractionDirectiveRes",
+      { "remoteUserInteractionDirectiveRes", "ansi_map.remoteUserInteractionDirectiveRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryBackwardRes,
-      { "sMSDeliveryBackwardRes", "ansi_map.sMSDeliveryBackwardRes",
+      { "sMSDeliveryBackwardRes", "ansi_map.sMSDeliveryBackwardRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryForwardRes,
-      { "sMSDeliveryForwardRes", "ansi_map.sMSDeliveryForwardRes",
+      { "sMSDeliveryForwardRes", "ansi_map.sMSDeliveryForwardRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSDeliveryPointToPointRes,
-      { "sMSDeliveryPointToPointRes", "ansi_map.sMSDeliveryPointToPointRes",
+      { "sMSDeliveryPointToPointRes", "ansi_map.sMSDeliveryPointToPointRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSNotificationRes,
-      { "sMSNotificationRes", "ansi_map.sMSNotificationRes",
+      { "sMSNotificationRes", "ansi_map.sMSNotificationRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sMSRequestRes,
-      { "sMSRequestRes", "ansi_map.sMSRequestRes",
+      { "sMSRequestRes", "ansi_map.sMSRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oTASPRequestRes,
-      { "oTASPRequestRes", "ansi_map.oTASPRequestRes",
+      { "oTASPRequestRes", "ansi_map.oTASPRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_changeFacilitiesRes,
-      { "changeFacilitiesRes", "ansi_map.changeFacilitiesRes",
+      { "changeFacilitiesRes", "ansi_map.changeFacilitiesRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_changeServiceRes,
-      { "changeServiceRes", "ansi_map.changeServiceRes",
+      { "changeServiceRes", "ansi_map.changeServiceRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_parameterRequestRes,
-      { "parameterRequestRes", "ansi_map.parameterRequestRes",
+      { "parameterRequestRes", "ansi_map.parameterRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_tMSIDirectiveRes,
-      { "tMSIDirectiveRes", "ansi_map.tMSIDirectiveRes",
+      { "tMSIDirectiveRes", "ansi_map.tMSIDirectiveRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_numberPortabilityRequestRes,
-      { "numberPortabilityRequestRes", "ansi_map.numberPortabilityRequestRes",
+      { "numberPortabilityRequestRes", "ansi_map.numberPortabilityRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_serviceRequestRes,
-      { "serviceRequestRes", "ansi_map.serviceRequestRes",
+      { "serviceRequestRes", "ansi_map.serviceRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_analyzedInformationRes,
-      { "analyzedInformationRes", "ansi_map.analyzedInformationRes",
+      { "analyzedInformationRes", "ansi_map.analyzedInformationRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_facilitySelectedAndAvailableRes,
-      { "facilitySelectedAndAvailableRes", "ansi_map.facilitySelectedAndAvailableRes",
+      { "facilitySelectedAndAvailableRes", "ansi_map.facilitySelectedAndAvailableRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_modifyRes,
-      { "modifyRes", "ansi_map.modifyRes",
+      { "modifyRes", "ansi_map.modifyRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_searchRes,
-      { "searchRes", "ansi_map.searchRes",
+      { "searchRes", "ansi_map.searchRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_seizeResourceRes,
-      { "seizeResourceRes", "ansi_map.seizeResourceRes",
+      { "seizeResourceRes", "ansi_map.seizeResourceRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_sRFDirectiveRes,
-      { "sRFDirectiveRes", "ansi_map.sRFDirectiveRes",
+      { "sRFDirectiveRes", "ansi_map.sRFDirectiveRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_tBusyRes,
-      { "tBusyRes", "ansi_map.tBusyRes",
+      { "tBusyRes", "ansi_map.tBusyRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_tNoAnswerRes,
-      { "tNoAnswerRes", "ansi_map.tNoAnswerRes",
+      { "tNoAnswerRes", "ansi_map.tNoAnswerRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_callControlDirectiveRes,
-      { "callControlDirectiveRes", "ansi_map.callControlDirectiveRes",
+      { "callControlDirectiveRes", "ansi_map.callControlDirectiveRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oDisconnectRes,
-      { "oDisconnectRes", "ansi_map.oDisconnectRes",
+      { "oDisconnectRes", "ansi_map.oDisconnectRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_tDisconnectRes,
-      { "tDisconnectRes", "ansi_map.tDisconnectRes",
+      { "tDisconnectRes", "ansi_map.tDisconnectRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oCalledPartyBusyRes,
-      { "oCalledPartyBusyRes", "ansi_map.oCalledPartyBusyRes",
+      { "oCalledPartyBusyRes", "ansi_map.oCalledPartyBusyRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_oNoAnswerRes,
-      { "oNoAnswerRes", "ansi_map.oNoAnswerRes",
+      { "oNoAnswerRes", "ansi_map.oNoAnswerRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_positionRequestRes,
-      { "positionRequestRes", "ansi_map.positionRequestRes",
+      { "positionRequestRes", "ansi_map.positionRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_positionRequestForwardRes,
-      { "positionRequestForwardRes", "ansi_map.positionRequestForwardRes",
+      { "positionRequestForwardRes", "ansi_map.positionRequestForwardRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemPositionRequestRes,
-      { "interSystemPositionRequestRes", "ansi_map.interSystemPositionRequestRes",
+      { "interSystemPositionRequestRes", "ansi_map.interSystemPositionRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemPositionRequestForwardRes,
-      { "interSystemPositionRequestForwardRes", "ansi_map.interSystemPositionRequestForwardRes",
+      { "interSystemPositionRequestForwardRes", "ansi_map.interSystemPositionRequestForwardRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_roamerDatabaseVerificationRequestRes,
-      { "roamerDatabaseVerificationRequestRes", "ansi_map.roamerDatabaseVerificationRequestRes",
+      { "roamerDatabaseVerificationRequestRes", "ansi_map.roamerDatabaseVerificationRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_addServiceRes,
-      { "addServiceRes", "ansi_map.addServiceRes",
+      { "addServiceRes", "ansi_map.addServiceRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_dropServiceRes,
-      { "dropServiceRes", "ansi_map.dropServiceRes",
+      { "dropServiceRes", "ansi_map.dropServiceRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemSMSPage,
-      { "interSystemSMSPage", "ansi_map.interSystemSMSPage",
+      { "interSystemSMSPage", "ansi_map.interSystemSMSPage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_lcsParameterRequestRes,
-      { "lcsParameterRequestRes", "ansi_map.lcsParameterRequestRes",
+      { "lcsParameterRequestRes", "ansi_map.lcsParameterRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_checkMEIDRes,
-      { "checkMEIDRes", "ansi_map.checkMEIDRes",
+      { "checkMEIDRes", "ansi_map.checkMEIDRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_statusRequestRes,
-      { "statusRequestRes", "ansi_map.statusRequestRes",
+      { "statusRequestRes", "ansi_map.statusRequestRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_interSystemSMSDeliveryPointToPointRes,
-      { "interSystemSMSDeliveryPointToPointRes", "ansi_map.interSystemSMSDeliveryPointToPointRes",
+      { "interSystemSMSDeliveryPointToPointRes", "ansi_map.interSystemSMSDeliveryPointToPointRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_map_qualificationRequest2Res,
-      { "qualificationRequest2Res", "ansi_map.qualificationRequest2Res",
+      { "qualificationRequest2Res", "ansi_map.qualificationRequest2Res_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
index ad979417c020907bbc49d5cf630bc5d85a75996c..8ba90aecc1b2f3104c953e5ee5cb8d074fcb4ff5 100644 (file)
@@ -1551,31 +1551,31 @@ proto_register_ansi_tcap(void)
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_ansi_tcap_unidirectional,
-      { "unidirectional", "ansi_tcap.unidirectional",
+      { "unidirectional", "ansi_tcap.unidirectional_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_queryWithPerm,
-      { "queryWithPerm", "ansi_tcap.queryWithPerm",
+      { "queryWithPerm", "ansi_tcap.queryWithPerm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_queryWithoutPerm,
-      { "queryWithoutPerm", "ansi_tcap.queryWithoutPerm",
+      { "queryWithoutPerm", "ansi_tcap.queryWithoutPerm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_response,
-      { "response", "ansi_tcap.response",
+      { "response", "ansi_tcap.response_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_conversationWithPerm,
-      { "conversationWithPerm", "ansi_tcap.conversationWithPerm",
+      { "conversationWithPerm", "ansi_tcap.conversationWithPerm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_conversationWithoutPerm,
-      { "conversationWithoutPerm", "ansi_tcap.conversationWithoutPerm",
+      { "conversationWithoutPerm", "ansi_tcap.conversationWithoutPerm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_abort,
-      { "abort", "ansi_tcap.abort",
+      { "abort", "ansi_tcap.abort_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_identifier,
@@ -1583,7 +1583,7 @@ proto_register_ansi_tcap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         "TransactionID", HFILL }},
     { &hf_ansi_tcap_dialoguePortion,
-      { "dialoguePortion", "ansi_tcap.dialoguePortion",
+      { "dialoguePortion", "ansi_tcap.dialoguePortion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_componentPortion,
@@ -1591,7 +1591,7 @@ proto_register_ansi_tcap(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "ComponentSequence", HFILL }},
     { &hf_ansi_tcap_dialogPortion,
-      { "dialogPortion", "ansi_tcap.dialogPortion",
+      { "dialogPortion", "ansi_tcap.dialogPortion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DialoguePortion", HFILL }},
     { &hf_ansi_tcap_causeInformation,
@@ -1603,7 +1603,7 @@ proto_register_ansi_tcap(void)
         FT_INT32, BASE_DEC, VALS(ansi_tcap_P_Abort_cause_U_vals), 0,
         "P_Abort_cause", HFILL }},
     { &hf_ansi_tcap_userInformation,
-      { "userInformation", "ansi_tcap.userInformation",
+      { "userInformation", "ansi_tcap.userInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "UserAbortInformation", HFILL }},
     { &hf_ansi_tcap_version,
@@ -1639,11 +1639,11 @@ proto_register_ansi_tcap(void)
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_ansi_tcap_confidentiality,
-      { "confidentiality", "ansi_tcap.confidentiality",
+      { "confidentiality", "ansi_tcap.confidentiality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap__untag_item,
-      { "_untag item", "ansi_tcap._untag_item",
+      { "_untag item", "ansi_tcap._untag_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_ansi_tcap_confidentialityId,
@@ -1663,27 +1663,27 @@ proto_register_ansi_tcap(void)
         FT_UINT32, BASE_DEC, VALS(ansi_tcap_ComponentPDU_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_invokeLast,
-      { "invokeLast", "ansi_tcap.invokeLast",
+      { "invokeLast", "ansi_tcap.invokeLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Invoke", HFILL }},
     { &hf_ansi_tcap_returnResultLast,
-      { "returnResultLast", "ansi_tcap.returnResultLast",
+      { "returnResultLast", "ansi_tcap.returnResultLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReturnResult", HFILL }},
     { &hf_ansi_tcap_returnError,
-      { "returnError", "ansi_tcap.returnError",
+      { "returnError", "ansi_tcap.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_reject,
-      { "reject", "ansi_tcap.reject",
+      { "reject", "ansi_tcap.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_invokeNotLast,
-      { "invokeNotLast", "ansi_tcap.invokeNotLast",
+      { "invokeNotLast", "ansi_tcap.invokeNotLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Invoke", HFILL }},
     { &hf_ansi_tcap_returnResultNotLast,
-      { "returnResultNotLast", "ansi_tcap.returnResultNotLast",
+      { "returnResultNotLast", "ansi_tcap.returnResultNotLast_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReturnResult", HFILL }},
     { &hf_ansi_tcap_componentIDs,
@@ -1695,7 +1695,7 @@ proto_register_ansi_tcap(void)
         FT_UINT32, BASE_DEC, VALS(ansi_tcap_OperationCode_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_parameter,
-      { "parameter", "ansi_tcap.parameter",
+      { "parameter", "ansi_tcap.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_componentID,
@@ -1703,7 +1703,7 @@ proto_register_ansi_tcap(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_parameter_01,
-      { "parameter", "ansi_tcap.parameter",
+      { "parameter", "ansi_tcap.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_parameter_01", HFILL }},
     { &hf_ansi_tcap_componentID_01,
@@ -1715,7 +1715,7 @@ proto_register_ansi_tcap(void)
         FT_UINT32, BASE_DEC, VALS(ansi_tcap_ErrorCode_vals), 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_parameter_02,
-      { "parameter", "ansi_tcap.parameter",
+      { "parameter", "ansi_tcap.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_parameter_02", HFILL }},
     { &hf_ansi_tcap_componentID_02,
@@ -1731,11 +1731,11 @@ proto_register_ansi_tcap(void)
         FT_UINT32, BASE_DEC, VALS(ansi_tcap_T_parameter_03_vals), 0,
         "T_parameter_03", HFILL }},
     { &hf_ansi_tcap_paramSequence,
-      { "paramSequence", "ansi_tcap.paramSequence",
+      { "paramSequence", "ansi_tcap.paramSequence_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_ansi_tcap_paramSet,
-      { "paramSet", "ansi_tcap.paramSet",
+      { "paramSet", "ansi_tcap.paramSet_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
index 18ca98570c1a2c86a9ad3ade5dbe7f6672d3ff01..c39e2f2467c53201d9412dce37f8d3eb085c549d 100644 (file)
@@ -1737,7 +1737,7 @@ void proto_register_c1222(void) {
 /*--- Included file: packet-c1222-hfarr.c ---*/
 #line 1 "../../asn1/c1222/packet-c1222-hfarr.c"
     { &hf_c1222_C1222_MESSAGE_PDU,
-      { "C1222-MESSAGE", "c1222.C1222_MESSAGE",
+      { "C1222-MESSAGE", "c1222.C1222_MESSAGE_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_c1222_aSO_context,
@@ -1769,11 +1769,11 @@ void proto_register_c1222(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_c1222_calling_authentication_value,
-      { "calling-authentication-value", "c1222.calling_authentication_value",
+      { "calling-authentication-value", "c1222.calling_authentication_value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_c1222_user_information,
-      { "user-information", "c1222.user_information",
+      { "user-information", "c1222.user_information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_c1222_calling_authentication_value_indirect,
@@ -1793,7 +1793,7 @@ void proto_register_c1222(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_c1222_calling_authentication_value_c1222,
-      { "calling-authentication-value-c1222", "c1222.calling_authentication_value_c1222",
+      { "calling-authentication-value-c1222", "c1222.calling_authentication_value_c1222_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_c1222_calling_authentication_value_c1221,
index 7c77267eb3d570543324ffa88a5bc5c8c5e44053..e38a8af430aa60748834d1285ed28b117e15c1f2 100644 (file)
@@ -7594,7 +7594,7 @@ void proto_register_camel(void) {
 /*--- Included file: packet-camel-hfarr.c ---*/
 #line 1 "../../asn1/camel/packet-camel-hfarr.c"
     { &hf_camel_PAR_cancelFailed_PDU,
-      { "PAR-cancelFailed", "camel.PAR_cancelFailed",
+      { "PAR-cancelFailed", "camel.PAR_cancelFailed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_PAR_requestedInfoError_PDU,
@@ -7610,15 +7610,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_PAR_taskRefused_vals), 0,
         NULL, HFILL }},
     { &hf_camel_CAP_GPRS_ReferenceNumber_PDU,
-      { "CAP-GPRS-ReferenceNumber", "camel.CAP_GPRS_ReferenceNumber",
+      { "CAP-GPRS-ReferenceNumber", "camel.CAP_GPRS_ReferenceNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_PlayAnnouncementArg_PDU,
-      { "PlayAnnouncementArg", "camel.PlayAnnouncementArg",
+      { "PlayAnnouncementArg", "camel.PlayAnnouncementArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_PromptAndCollectUserInformationArg_PDU,
-      { "PromptAndCollectUserInformationArg", "camel.PromptAndCollectUserInformationArg",
+      { "PromptAndCollectUserInformationArg", "camel.PromptAndCollectUserInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ReceivedInformationArg_PDU,
@@ -7630,7 +7630,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_SpecializedResourceReportArg_vals), 0,
         NULL, HFILL }},
     { &hf_camel_ApplyChargingArg_PDU,
-      { "ApplyChargingArg", "camel.ApplyChargingArg",
+      { "ApplyChargingArg", "camel.ApplyChargingArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ApplyChargingReportArg_PDU,
@@ -7638,19 +7638,19 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_AssistRequestInstructionsArg_PDU,
-      { "AssistRequestInstructionsArg", "camel.AssistRequestInstructionsArg",
+      { "AssistRequestInstructionsArg", "camel.AssistRequestInstructionsArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CallGapArg_PDU,
-      { "CallGapArg", "camel.CallGapArg",
+      { "CallGapArg", "camel.CallGapArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CallInformationReportArg_PDU,
-      { "CallInformationReportArg", "camel.CallInformationReportArg",
+      { "CallInformationReportArg", "camel.CallInformationReportArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CallInformationRequestArg_PDU,
-      { "CallInformationRequestArg", "camel.CallInformationRequestArg",
+      { "CallInformationRequestArg", "camel.CallInformationRequestArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CancelArg_PDU,
@@ -7658,27 +7658,27 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_CancelArg_vals), 0,
         NULL, HFILL }},
     { &hf_camel_CollectInformationArg_PDU,
-      { "CollectInformationArg", "camel.CollectInformationArg",
+      { "CollectInformationArg", "camel.CollectInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ConnectArg_PDU,
-      { "ConnectArg", "camel.ConnectArg",
+      { "ConnectArg", "camel.ConnectArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ConnectToResourceArg_PDU,
-      { "ConnectToResourceArg", "camel.ConnectToResourceArg",
+      { "ConnectToResourceArg", "camel.ConnectToResourceArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ContinueWithArgumentArg_PDU,
-      { "ContinueWithArgumentArg", "camel.ContinueWithArgumentArg",
+      { "ContinueWithArgumentArg", "camel.ContinueWithArgumentArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_DisconnectForwardConnectionWithArgumentArg_PDU,
-      { "DisconnectForwardConnectionWithArgumentArg", "camel.DisconnectForwardConnectionWithArgumentArg",
+      { "DisconnectForwardConnectionWithArgumentArg", "camel.DisconnectForwardConnectionWithArgumentArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_DisconnectLegArg_PDU,
-      { "DisconnectLegArg", "camel.DisconnectLegArg",
+      { "DisconnectLegArg", "camel.DisconnectLegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EntityReleasedArg_PDU,
@@ -7686,11 +7686,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_EntityReleasedArg_vals), 0,
         NULL, HFILL }},
     { &hf_camel_EstablishTemporaryConnectionArg_PDU,
-      { "EstablishTemporaryConnectionArg", "camel.EstablishTemporaryConnectionArg",
+      { "EstablishTemporaryConnectionArg", "camel.EstablishTemporaryConnectionArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EventReportBCSMArg_PDU,
-      { "EventReportBCSMArg", "camel.EventReportBCSMArg",
+      { "EventReportBCSMArg", "camel.EventReportBCSMArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_FurnishChargingInformationArg_PDU,
@@ -7698,23 +7698,23 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitialDPArg_PDU,
-      { "InitialDPArg", "camel.InitialDPArg",
+      { "InitialDPArg", "camel.InitialDPArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitiateCallAttemptArg_PDU,
-      { "InitiateCallAttemptArg", "camel.InitiateCallAttemptArg",
+      { "InitiateCallAttemptArg", "camel.InitiateCallAttemptArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitiateCallAttemptRes_PDU,
-      { "InitiateCallAttemptRes", "camel.InitiateCallAttemptRes",
+      { "InitiateCallAttemptRes", "camel.InitiateCallAttemptRes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_MoveLegArg_PDU,
-      { "MoveLegArg", "camel.MoveLegArg",
+      { "MoveLegArg", "camel.MoveLegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_PlayToneArg_PDU,
-      { "PlayToneArg", "camel.PlayToneArg",
+      { "PlayToneArg", "camel.PlayToneArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ReleaseCallArg_PDU,
@@ -7722,47 +7722,47 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_ReleaseCallArg_vals), 0,
         NULL, HFILL }},
     { &hf_camel_RequestReportBCSMEventArg_PDU,
-      { "RequestReportBCSMEventArg", "camel.RequestReportBCSMEventArg",
+      { "RequestReportBCSMEventArg", "camel.RequestReportBCSMEventArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ResetTimerArg_PDU,
-      { "ResetTimerArg", "camel.ResetTimerArg",
+      { "ResetTimerArg", "camel.ResetTimerArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_SendChargingInformationArg_PDU,
-      { "SendChargingInformationArg", "camel.SendChargingInformationArg",
+      { "SendChargingInformationArg", "camel.SendChargingInformationArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_SplitLegArg_PDU,
-      { "SplitLegArg", "camel.SplitLegArg",
+      { "SplitLegArg", "camel.SplitLegArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ApplyChargingGPRSArg_PDU,
-      { "ApplyChargingGPRSArg", "camel.ApplyChargingGPRSArg",
+      { "ApplyChargingGPRSArg", "camel.ApplyChargingGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ApplyChargingReportGPRSArg_PDU,
-      { "ApplyChargingReportGPRSArg", "camel.ApplyChargingReportGPRSArg",
+      { "ApplyChargingReportGPRSArg", "camel.ApplyChargingReportGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CancelGPRSArg_PDU,
-      { "CancelGPRSArg", "camel.CancelGPRSArg",
+      { "CancelGPRSArg", "camel.CancelGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ConnectGPRSArg_PDU,
-      { "ConnectGPRSArg", "camel.ConnectGPRSArg",
+      { "ConnectGPRSArg", "camel.ConnectGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ContinueGPRSArg_PDU,
-      { "ContinueGPRSArg", "camel.ContinueGPRSArg",
+      { "ContinueGPRSArg", "camel.ContinueGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EntityReleasedGPRSArg_PDU,
-      { "EntityReleasedGPRSArg", "camel.EntityReleasedGPRSArg",
+      { "EntityReleasedGPRSArg", "camel.EntityReleasedGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EventReportGPRSArg_PDU,
-      { "EventReportGPRSArg", "camel.EventReportGPRSArg",
+      { "EventReportGPRSArg", "camel.EventReportGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_FurnishChargingInformationGPRSArg_PDU,
@@ -7770,31 +7770,31 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitialDPGPRSArg_PDU,
-      { "InitialDPGPRSArg", "camel.InitialDPGPRSArg",
+      { "InitialDPGPRSArg", "camel.InitialDPGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ReleaseGPRSArg_PDU,
-      { "ReleaseGPRSArg", "camel.ReleaseGPRSArg",
+      { "ReleaseGPRSArg", "camel.ReleaseGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_RequestReportGPRSEventArg_PDU,
-      { "RequestReportGPRSEventArg", "camel.RequestReportGPRSEventArg",
+      { "RequestReportGPRSEventArg", "camel.RequestReportGPRSEventArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ResetTimerGPRSArg_PDU,
-      { "ResetTimerGPRSArg", "camel.ResetTimerGPRSArg",
+      { "ResetTimerGPRSArg", "camel.ResetTimerGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_SendChargingInformationGPRSArg_PDU,
-      { "SendChargingInformationGPRSArg", "camel.SendChargingInformationGPRSArg",
+      { "SendChargingInformationGPRSArg", "camel.SendChargingInformationGPRSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ConnectSMSArg_PDU,
-      { "ConnectSMSArg", "camel.ConnectSMSArg",
+      { "ConnectSMSArg", "camel.ConnectSMSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_EventReportSMSArg_PDU,
-      { "EventReportSMSArg", "camel.EventReportSMSArg",
+      { "EventReportSMSArg", "camel.EventReportSMSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_FurnishChargingInformationSMSArg_PDU,
@@ -7802,7 +7802,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_InitialDPSMSArg_PDU,
-      { "InitialDPSMSArg", "camel.InitialDPSMSArg",
+      { "InitialDPSMSArg", "camel.InitialDPSMSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ReleaseSMSArg_PDU,
@@ -7810,11 +7810,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_RequestReportSMSEventArg_PDU,
-      { "RequestReportSMSEventArg", "camel.RequestReportSMSEventArg",
+      { "RequestReportSMSEventArg", "camel.RequestReportSMSEventArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ResetTimerSMSArg_PDU,
-      { "ResetTimerSMSArg", "camel.ResetTimerSMSArg",
+      { "ResetTimerSMSArg", "camel.ResetTimerSMSArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_CAP_U_ABORT_REASON_PDU,
@@ -7830,15 +7830,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CallSegmentID", HFILL }},
     { &hf_camel_aOCInitial,
-      { "aOCInitial", "camel.aOCInitial",
+      { "aOCInitial", "camel.aOCInitial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CAI_GSM0224", HFILL }},
     { &hf_camel_aOCSubsequent,
-      { "aOCSubsequent", "camel.aOCSubsequent",
+      { "aOCSubsequent", "camel.aOCSubsequent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cAI_GSM0224,
-      { "cAI-GSM0224", "camel.cAI_GSM0224",
+      { "cAI-GSM0224", "camel.cAI_GSM0224_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_aocSubsequent_tariffSwitchInterval,
@@ -7850,7 +7850,7 @@ void proto_register_camel(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_camel_burstList,
-      { "burstList", "camel.burstList",
+      { "burstList", "camel.burstList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_conferenceTreatmentIndicator,
@@ -7866,11 +7866,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_camel_gapOnService,
-      { "gapOnService", "camel.gapOnService",
+      { "gapOnService", "camel.gapOnService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_calledAddressAndService,
-      { "calledAddressAndService", "camel.calledAddressAndService",
+      { "calledAddressAndService", "camel.calledAddressAndService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_serviceKey,
@@ -7878,7 +7878,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callingAddressAndService,
-      { "callingAddressAndService", "camel.callingAddressAndService",
+      { "callingAddressAndService", "camel.callingAddressAndService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callingAddressValue,
@@ -7898,7 +7898,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_DpSpecificCriteria_vals), 0,
         NULL, HFILL }},
     { &hf_camel_automaticRearm,
-      { "automaticRearm", "camel.automaticRearm",
+      { "automaticRearm", "camel.automaticRearm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cause,
@@ -7934,7 +7934,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_1200", HFILL }},
     { &hf_camel_bursts,
-      { "bursts", "camel.bursts",
+      { "bursts", "camel.bursts_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Burst", HFILL }},
     { &hf_camel_e1,
@@ -7974,7 +7974,7 @@ void proto_register_camel(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeDurationCharging,
-      { "timeDurationCharging", "camel.timeDurationCharging",
+      { "timeDurationCharging", "camel.timeDurationCharging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_maxCallPeriodDuration,
@@ -7998,7 +7998,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeDurationChargingResult,
-      { "timeDurationChargingResult", "camel.timeDurationChargingResult",
+      { "timeDurationChargingResult", "camel.timeDurationChargingResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeDurationChargingResultpartyToCharge,
@@ -8014,7 +8014,7 @@ void proto_register_camel(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_camel_callLegReleasedAtTcpExpiry,
-      { "callLegReleasedAtTcpExpiry", "camel.callLegReleasedAtTcpExpiry",
+      { "callLegReleasedAtTcpExpiry", "camel.callLegReleasedAtTcpExpiry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_aChChargingAddress,
@@ -8022,7 +8022,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_AChChargingAddress_vals), 0,
         NULL, HFILL }},
     { &hf_camel_fci_fCIBCCCAMELsequence1,
-      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1",
+      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fci_fCIBCCCAMELsequence1", HFILL }},
     { &hf_camel_freeFormatData,
@@ -8038,7 +8038,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_AppendFreeFormatData_vals), 0,
         NULL, HFILL }},
     { &hf_camel_fciGPRS_fCIBCCCAMELsequence1,
-      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1",
+      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fciGPRS_fCIBCCCAMELsequence1", HFILL }},
     { &hf_camel_pDPID,
@@ -8046,23 +8046,23 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_fciSMS_fCIBCCCAMELsequence1,
-      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1",
+      { "fCIBCCCAMELsequence1", "camel.fCIBCCCAMELsequence1_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_fciSMS_fCIBCCCAMELsequence1", HFILL }},
     { &hf_camel_aOCBeforeAnswer,
-      { "aOCBeforeAnswer", "camel.aOCBeforeAnswer",
+      { "aOCBeforeAnswer", "camel.aOCBeforeAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_aOCAfterAnswer,
-      { "aOCAfterAnswer", "camel.aOCAfterAnswer",
+      { "aOCAfterAnswer", "camel.aOCAfterAnswer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AOCSubsequent", HFILL }},
     { &hf_camel_aOC_extension,
-      { "aOC-extension", "camel.aOC_extension",
+      { "aOC-extension", "camel.aOC_extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CAMEL_SCIBillingChargingCharacteristicsAlt", HFILL }},
     { &hf_camel_aOCGPRS,
-      { "aOCGPRS", "camel.aOCGPRS",
+      { "aOCGPRS", "camel.aOCGPRS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ChangeOfPositionControlInfo_item,
@@ -8082,19 +8082,19 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LAIFixedLength", HFILL }},
     { &hf_camel_inter_SystemHandOver,
-      { "inter-SystemHandOver", "camel.inter_SystemHandOver",
+      { "inter-SystemHandOver", "camel.inter_SystemHandOver_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_inter_PLMNHandOver,
-      { "inter-PLMNHandOver", "camel.inter_PLMNHandOver",
+      { "inter-PLMNHandOver", "camel.inter_PLMNHandOver_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_inter_MSCHandOver,
-      { "inter-MSCHandOver", "camel.inter_MSCHandOver",
+      { "inter-MSCHandOver", "camel.inter_MSCHandOver_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_changeOfLocationAlt,
-      { "changeOfLocationAlt", "camel.changeOfLocationAlt",
+      { "changeOfLocationAlt", "camel.changeOfLocationAlt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_maxTransferredVolume,
@@ -8166,7 +8166,7 @@ void proto_register_camel(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_camel_collectedDigits,
-      { "collectedDigits", "camel.collectedDigits",
+      { "collectedDigits", "camel.collectedDigits_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_basicGapCriteria,
@@ -8186,11 +8186,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_midCallControlInfo,
-      { "midCallControlInfo", "camel.midCallControlInfo",
+      { "midCallControlInfo", "camel.midCallControlInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_dpSpecificCriteriaAlt,
-      { "dpSpecificCriteriaAlt", "camel.dpSpecificCriteriaAlt",
+      { "dpSpecificCriteriaAlt", "camel.dpSpecificCriteriaAlt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_changeOfPositionControlInfo,
@@ -8206,7 +8206,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_1_127", HFILL }},
     { &hf_camel_oServiceChangeSpecificInfo,
-      { "oServiceChangeSpecificInfo", "camel.oServiceChangeSpecificInfo",
+      { "oServiceChangeSpecificInfo", "camel.oServiceChangeSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_ext_basicServiceCode,
@@ -8222,11 +8222,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_NatureOfServiceChange_vals), 0,
         NULL, HFILL }},
     { &hf_camel_tServiceChangeSpecificInfo,
-      { "tServiceChangeSpecificInfo", "camel.tServiceChangeSpecificInfo",
+      { "tServiceChangeSpecificInfo", "camel.tServiceChangeSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_collectedInfoSpecificInfo,
-      { "collectedInfoSpecificInfo", "camel.collectedInfoSpecificInfo",
+      { "collectedInfoSpecificInfo", "camel.collectedInfoSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_calledPartyNumber,
@@ -8238,7 +8238,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_86400", HFILL }},
     { &hf_camel_timeGPRSIfTariffSwitch,
-      { "timeGPRSIfTariffSwitch", "camel.timeGPRSIfTariffSwitch",
+      { "timeGPRSIfTariffSwitch", "camel.timeGPRSIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeGPRSSinceLastTariffSwitch,
@@ -8254,7 +8254,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_camel_rO_TimeGPRSIfTariffSwitch,
-      { "rO-TimeGPRSIfTariffSwitch", "camel.rO_TimeGPRSIfTariffSwitch",
+      { "rO-TimeGPRSIfTariffSwitch", "camel.rO_TimeGPRSIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_rO_TimeGPRSSinceLastTariffSwitch,
@@ -8278,7 +8278,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_routeSelectFailureSpecificInfo,
-      { "routeSelectFailureSpecificInfo", "camel.routeSelectFailureSpecificInfo",
+      { "routeSelectFailureSpecificInfo", "camel.routeSelectFailureSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_routeSelectfailureCause,
@@ -8286,7 +8286,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_camel_oCalledPartyBusySpecificInfo,
-      { "oCalledPartyBusySpecificInfo", "camel.oCalledPartyBusySpecificInfo",
+      { "oCalledPartyBusySpecificInfo", "camel.oCalledPartyBusySpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_busyCause,
@@ -8294,11 +8294,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_camel_oNoAnswerSpecificInfo,
-      { "oNoAnswerSpecificInfo", "camel.oNoAnswerSpecificInfo",
+      { "oNoAnswerSpecificInfo", "camel.oNoAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oAnswerSpecificInfo,
-      { "oAnswerSpecificInfo", "camel.oAnswerSpecificInfo",
+      { "oAnswerSpecificInfo", "camel.oAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_destinationAddress,
@@ -8306,11 +8306,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "CalledPartyNumber", HFILL }},
     { &hf_camel_or_Call,
-      { "or-Call", "camel.or_Call",
+      { "or-Call", "camel.or_Call_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_forwardedCall,
-      { "forwardedCall", "camel.forwardedCall",
+      { "forwardedCall", "camel.forwardedCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_chargeIndicator,
@@ -8322,7 +8322,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_Ext_BasicServiceCode_vals), 0,
         "Ext_BasicServiceCode", HFILL }},
     { &hf_camel_oMidCallSpecificInfo,
-      { "oMidCallSpecificInfo", "camel.oMidCallSpecificInfo",
+      { "oMidCallSpecificInfo", "camel.oMidCallSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_omidCallEvents,
@@ -8338,7 +8338,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_camel_oDisconnectSpecificInfo,
-      { "oDisconnectSpecificInfo", "camel.oDisconnectSpecificInfo",
+      { "oDisconnectSpecificInfo", "camel.oDisconnectSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_releaseCause,
@@ -8346,15 +8346,15 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Cause", HFILL }},
     { &hf_camel_tBusySpecificInfo,
-      { "tBusySpecificInfo", "camel.tBusySpecificInfo",
+      { "tBusySpecificInfo", "camel.tBusySpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callForwarded,
-      { "callForwarded", "camel.callForwarded",
+      { "callForwarded", "camel.callForwarded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_routeNotPermitted,
-      { "routeNotPermitted", "camel.routeNotPermitted",
+      { "routeNotPermitted", "camel.routeNotPermitted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_forwardingDestinationNumber,
@@ -8362,15 +8362,15 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "CalledPartyNumber", HFILL }},
     { &hf_camel_tNoAnswerSpecificInfo,
-      { "tNoAnswerSpecificInfo", "camel.tNoAnswerSpecificInfo",
+      { "tNoAnswerSpecificInfo", "camel.tNoAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tAnswerSpecificInfo,
-      { "tAnswerSpecificInfo", "camel.tAnswerSpecificInfo",
+      { "tAnswerSpecificInfo", "camel.tAnswerSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tMidCallSpecificInfo,
-      { "tMidCallSpecificInfo", "camel.tMidCallSpecificInfo",
+      { "tMidCallSpecificInfo", "camel.tMidCallSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tmidCallEvents,
@@ -8378,27 +8378,27 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_T_tmidCallEvents_vals), 0,
         "T_tmidCallEvents", HFILL }},
     { &hf_camel_tDisconnectSpecificInfo,
-      { "tDisconnectSpecificInfo", "camel.tDisconnectSpecificInfo",
+      { "tDisconnectSpecificInfo", "camel.tDisconnectSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oTermSeizedSpecificInfo,
-      { "oTermSeizedSpecificInfo", "camel.oTermSeizedSpecificInfo",
+      { "oTermSeizedSpecificInfo", "camel.oTermSeizedSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_locationInformation,
-      { "locationInformation", "camel.locationInformation",
+      { "locationInformation", "camel.locationInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callAcceptedSpecificInfo,
-      { "callAcceptedSpecificInfo", "camel.callAcceptedSpecificInfo",
+      { "callAcceptedSpecificInfo", "camel.callAcceptedSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oAbandonSpecificInfo,
-      { "oAbandonSpecificInfo", "camel.oAbandonSpecificInfo",
+      { "oAbandonSpecificInfo", "camel.oAbandonSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oChangeOfPositionSpecificInfo,
-      { "oChangeOfPositionSpecificInfo", "camel.oChangeOfPositionSpecificInfo",
+      { "oChangeOfPositionSpecificInfo", "camel.oChangeOfPositionSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_metDPCriteriaList,
@@ -8406,15 +8406,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tChangeOfPositionSpecificInfo,
-      { "tChangeOfPositionSpecificInfo", "camel.tChangeOfPositionSpecificInfo",
+      { "tChangeOfPositionSpecificInfo", "camel.tChangeOfPositionSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_dpSpecificInfoAlt,
-      { "dpSpecificInfoAlt", "camel.dpSpecificInfoAlt",
+      { "dpSpecificInfoAlt", "camel.dpSpecificInfoAlt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_o_smsFailureSpecificInfo,
-      { "o-smsFailureSpecificInfo", "camel.o_smsFailureSpecificInfo",
+      { "o-smsFailureSpecificInfo", "camel.o_smsFailureSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_smsfailureCause,
@@ -8422,11 +8422,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_MO_SMSCause_vals), 0,
         "MO_SMSCause", HFILL }},
     { &hf_camel_o_smsSubmissionSpecificInfo,
-      { "o-smsSubmissionSpecificInfo", "camel.o_smsSubmissionSpecificInfo",
+      { "o-smsSubmissionSpecificInfo", "camel.o_smsSubmissionSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_t_smsFailureSpecificInfo,
-      { "t-smsFailureSpecificInfo", "camel.t_smsFailureSpecificInfo",
+      { "t-smsFailureSpecificInfo", "camel.t_smsFailureSpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_t_smsFailureSpecificInfo", HFILL }},
     { &hf_camel_t_smsfailureCause,
@@ -8434,11 +8434,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "MT_SMSCause", HFILL }},
     { &hf_camel_t_smsDeliverySpecificInfo,
-      { "t-smsDeliverySpecificInfo", "camel.t_smsDeliverySpecificInfo",
+      { "t-smsDeliverySpecificInfo", "camel.t_smsDeliverySpecificInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_t_smsDeliverySpecificInfo", HFILL }},
     { &hf_camel_Extensions_item,
-      { "ExtensionField", "camel.ExtensionField",
+      { "ExtensionField", "camel.ExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_type,
@@ -8450,7 +8450,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(inap_CriticalityType_vals), 0,
         "CriticalityType", HFILL }},
     { &hf_camel_value,
-      { "value", "camel.value",
+      { "value", "camel.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callDiversionTreatmentIndicator,
@@ -8462,7 +8462,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING_SIZE_1", HFILL }},
     { &hf_camel_compoundGapCriteria,
-      { "compoundGapCriteria", "camel.compoundGapCriteria",
+      { "compoundGapCriteria", "camel.compoundGapCriteria_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompoundCriteria", HFILL }},
     { &hf_camel_gapIndicatorsDuration,
@@ -8502,15 +8502,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_GPRSEventType_vals), 0,
         NULL, HFILL }},
     { &hf_camel_attachChangeOfPositionSpecificInformation,
-      { "attachChangeOfPositionSpecificInformation", "camel.attachChangeOfPositionSpecificInformation",
+      { "attachChangeOfPositionSpecificInformation", "camel.attachChangeOfPositionSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_locationInformationGPRS,
-      { "locationInformationGPRS", "camel.locationInformationGPRS",
+      { "locationInformationGPRS", "camel.locationInformationGPRS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_pdp_ContextchangeOfPositionSpecificInformation,
-      { "pdp-ContextchangeOfPositionSpecificInformation", "camel.pdp_ContextchangeOfPositionSpecificInformation",
+      { "pdp-ContextchangeOfPositionSpecificInformation", "camel.pdp_ContextchangeOfPositionSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_accessPointName,
@@ -8522,11 +8522,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GPRSChargingID", HFILL }},
     { &hf_camel_endUserAddress,
-      { "endUserAddress", "camel.endUserAddress",
+      { "endUserAddress", "camel.endUserAddress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_qualityOfService,
-      { "qualityOfService", "camel.qualityOfService",
+      { "qualityOfService", "camel.qualityOfService_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeAndTimeZone,
@@ -8538,7 +8538,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "GSN_Address", HFILL }},
     { &hf_camel_detachSpecificInformation,
-      { "detachSpecificInformation", "camel.detachSpecificInformation",
+      { "detachSpecificInformation", "camel.detachSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_initiatingEntity,
@@ -8546,15 +8546,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_InitiatingEntity_vals), 0,
         NULL, HFILL }},
     { &hf_camel_routeingAreaUpdate,
-      { "routeingAreaUpdate", "camel.routeingAreaUpdate",
+      { "routeingAreaUpdate", "camel.routeingAreaUpdate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_disconnectSpecificInformation,
-      { "disconnectSpecificInformation", "camel.disconnectSpecificInformation",
+      { "disconnectSpecificInformation", "camel.disconnectSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_pDPContextEstablishmentSpecificInformation,
-      { "pDPContextEstablishmentSpecificInformation", "camel.pDPContextEstablishmentSpecificInformation",
+      { "pDPContextEstablishmentSpecificInformation", "camel.pDPContextEstablishmentSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_pDPInitiationType,
@@ -8562,11 +8562,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_PDPInitiationType_vals), 0,
         NULL, HFILL }},
     { &hf_camel_secondaryPDP_context,
-      { "secondaryPDP-context", "camel.secondaryPDP_context",
+      { "secondaryPDP-context", "camel.secondaryPDP_context_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_pDPContextEstablishmentAcknowledgementSpecificInformation,
-      { "pDPContextEstablishmentAcknowledgementSpecificInformation", "camel.pDPContextEstablishmentAcknowledgementSpecificInformation",
+      { "pDPContextEstablishmentAcknowledgementSpecificInformation", "camel.pDPContextEstablishmentAcknowledgementSpecificInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_messageID,
@@ -8586,11 +8586,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_32767", HFILL }},
     { &hf_camel_inbandInfo,
-      { "inbandInfo", "camel.inbandInfo",
+      { "inbandInfo", "camel.inbandInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tone,
-      { "tone", "camel.tone",
+      { "tone", "camel.tone_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cellGlobalIdOrServiceAreaIdOrLAI,
@@ -8614,11 +8614,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LSAIdentity", HFILL }},
     { &hf_camel_extensionContainer,
-      { "extensionContainer", "camel.extensionContainer",
+      { "extensionContainer", "camel.extensionContainer_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_sai_Present,
-      { "sai-Present", "camel.sai_Present",
+      { "sai-Present", "camel.sai_Present_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_userCSGInformation,
@@ -8630,7 +8630,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Integer4", HFILL }},
     { &hf_camel_text,
-      { "text", "camel.text",
+      { "text", "camel.text_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_messageContent,
@@ -8650,7 +8650,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_variableMessage,
-      { "variableMessage", "camel.variableMessage",
+      { "variableMessage", "camel.variableMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_variableParts,
@@ -8690,15 +8690,15 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LAIFixedLength", HFILL }},
     { &hf_camel_inter_SystemHandOverToUMTS,
-      { "inter-SystemHandOverToUMTS", "camel.inter_SystemHandOverToUMTS",
+      { "inter-SystemHandOverToUMTS", "camel.inter_SystemHandOverToUMTS_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_inter_SystemHandOverToGSM,
-      { "inter-SystemHandOverToGSM", "camel.inter_SystemHandOverToGSM",
+      { "inter-SystemHandOverToGSM", "camel.inter_SystemHandOverToGSM_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_metDPCriterionAlt,
-      { "metDPCriterionAlt", "camel.metDPCriterionAlt",
+      { "metDPCriterionAlt", "camel.metDPCriterionAlt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_minimumNumberOfDigits,
@@ -8722,15 +8722,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_GPRS_QoS_vals), 0,
         "GPRS_QoS", HFILL }},
     { &hf_camel_requested_QoS_Extension,
-      { "requested-QoS-Extension", "camel.requested_QoS_Extension",
+      { "requested-QoS-Extension", "camel.requested_QoS_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPRS_QoS_Extension", HFILL }},
     { &hf_camel_subscribed_QoS_Extension,
-      { "subscribed-QoS-Extension", "camel.subscribed_QoS_Extension",
+      { "subscribed-QoS-Extension", "camel.subscribed_QoS_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPRS_QoS_Extension", HFILL }},
     { &hf_camel_negotiated_QoS_Extension,
-      { "negotiated-QoS-Extension", "camel.negotiated_QoS_Extension",
+      { "negotiated-QoS-Extension", "camel.negotiated_QoS_Extension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "GPRS_QoS_Extension", HFILL }},
     { &hf_camel_receivingSideID,
@@ -8738,7 +8738,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LegType", HFILL }},
     { &hf_camel_RequestedInformationList_item,
-      { "RequestedInformation", "camel.RequestedInformation",
+      { "RequestedInformation", "camel.RequestedInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_RequestedInformationTypeList_item,
@@ -8774,11 +8774,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LegType", HFILL }},
     { &hf_camel_forwardServiceInteractionInd,
-      { "forwardServiceInteractionInd", "camel.forwardServiceInteractionInd",
+      { "forwardServiceInteractionInd", "camel.forwardServiceInteractionInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_backwardServiceInteractionInd,
-      { "backwardServiceInteractionInd", "camel.backwardServiceInteractionInd",
+      { "backwardServiceInteractionInd", "camel.backwardServiceInteractionInd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_bothwayThroughConnectionInd,
@@ -8790,7 +8790,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_ConnectedNumberTreatmentInd_vals), 0,
         NULL, HFILL }},
     { &hf_camel_nonCUGCall,
-      { "nonCUGCall", "camel.nonCUGCall",
+      { "nonCUGCall", "camel.nonCUGCall_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_holdTreatmentIndicator,
@@ -8822,7 +8822,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timeIfTariffSwitch,
-      { "timeIfTariffSwitch", "camel.timeIfTariffSwitch",
+      { "timeIfTariffSwitch", "camel.timeIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_toneID,
@@ -8838,7 +8838,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_4294967295", HFILL }},
     { &hf_camel_volumeIfTariffSwitch,
-      { "volumeIfTariffSwitch", "camel.volumeIfTariffSwitch",
+      { "volumeIfTariffSwitch", "camel.volumeIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_volumeSinceLastTariffSwitch,
@@ -8854,7 +8854,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "INTEGER_0_255", HFILL }},
     { &hf_camel_rO_VolumeIfTariffSwitch,
-      { "rO-VolumeIfTariffSwitch", "camel.rO_VolumeIfTariffSwitch",
+      { "rO-VolumeIfTariffSwitch", "camel.rO_VolumeIfTariffSwitch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_rO_VolumeSinceLastTariffSwitch,
@@ -8922,11 +8922,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "Digits", HFILL }},
     { &hf_camel_allAnnouncementsComplete,
-      { "allAnnouncementsComplete", "camel.allAnnouncementsComplete",
+      { "allAnnouncementsComplete", "camel.allAnnouncementsComplete_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_firstAnnouncementStarted,
-      { "firstAnnouncementStarted", "camel.firstAnnouncementStarted",
+      { "firstAnnouncementStarted", "camel.firstAnnouncementStarted_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_aChBillingChargingCharacteristics,
@@ -8954,7 +8954,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_GapCriteria_vals), 0,
         NULL, HFILL }},
     { &hf_camel_gapIndicators,
-      { "gapIndicators", "camel.gapIndicators",
+      { "gapIndicators", "camel.gapIndicators_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_controlType,
@@ -8982,11 +8982,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_SendingSideID_vals), 0,
         "SendingSideID", HFILL }},
     { &hf_camel_allRequests,
-      { "allRequests", "camel.allRequests",
+      { "allRequests", "camel.allRequests_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callSegmentToCancel,
-      { "callSegmentToCancel", "camel.callSegmentToCancel",
+      { "callSegmentToCancel", "camel.callSegmentToCancel_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_destinationRoutingAddress,
@@ -9022,7 +9022,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_serviceInteractionIndicatorsTwo,
-      { "serviceInteractionIndicatorsTwo", "camel.serviceInteractionIndicatorsTwo",
+      { "serviceInteractionIndicatorsTwo", "camel.serviceInteractionIndicatorsTwo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_chargeNumber,
@@ -9038,15 +9038,15 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cug_OutgoingAccess,
-      { "cug-OutgoingAccess", "camel.cug_OutgoingAccess",
+      { "cug-OutgoingAccess", "camel.cug_OutgoingAccess_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppressionOfAnnouncement,
-      { "suppressionOfAnnouncement", "camel.suppressionOfAnnouncement",
+      { "suppressionOfAnnouncement", "camel.suppressionOfAnnouncement_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_oCSIApplicable,
-      { "oCSIApplicable", "camel.oCSIApplicable",
+      { "oCSIApplicable", "camel.oCSIApplicable_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_naOliInfo,
@@ -9054,11 +9054,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_bor_InterrogationRequested,
-      { "bor-InterrogationRequested", "camel.bor_InterrogationRequested",
+      { "bor-InterrogationRequested", "camel.bor_InterrogationRequested_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppress_N_CSI,
-      { "suppress-N-CSI", "camel.suppress_N_CSI",
+      { "suppress-N-CSI", "camel.suppress_N_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_resourceAddress,
@@ -9070,23 +9070,23 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_none,
-      { "none", "camel.none",
+      { "none", "camel.none_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppress_O_CSI,
-      { "suppress-O-CSI", "camel.suppress_O_CSI",
+      { "suppress-O-CSI", "camel.suppress_O_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_continueWithArgumentArgExtension,
-      { "continueWithArgumentArgExtension", "camel.continueWithArgumentArgExtension",
+      { "continueWithArgumentArgExtension", "camel.continueWithArgumentArgExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppress_D_CSI,
-      { "suppress-D-CSI", "camel.suppress_D_CSI",
+      { "suppress-D-CSI", "camel.suppress_D_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_suppressOutgoingCallBarring,
-      { "suppressOutgoingCallBarring", "camel.suppressOutgoingCallBarring",
+      { "suppressOutgoingCallBarring", "camel.suppressOutgoingCallBarring_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_legOrCallSegment,
@@ -9098,11 +9098,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(inap_LegID_vals), 0,
         "LegID", HFILL }},
     { &hf_camel_callSegmentFailure,
-      { "callSegmentFailure", "camel.callSegmentFailure",
+      { "callSegmentFailure", "camel.callSegmentFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_bCSM_Failure,
-      { "bCSM-Failure", "camel.bCSM_Failure",
+      { "bCSM-Failure", "camel.bCSM_Failure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_assistingSSPIPRoutingAddress,
@@ -9118,7 +9118,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_EventSpecificInformationBCSM_vals), 0,
         NULL, HFILL }},
     { &hf_camel_miscCallInfo,
-      { "miscCallInfo", "camel.miscCallInfo",
+      { "miscCallInfo", "camel.miscCallInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_cGEncountered,
@@ -9170,11 +9170,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_callForwardingSS_Pending,
-      { "callForwardingSS-Pending", "camel.callForwardingSS_Pending",
+      { "callForwardingSS-Pending", "camel.callForwardingSS_Pending_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_initialDPArgExtension,
-      { "initialDPArgExtension", "camel.initialDPArgExtension",
+      { "initialDPArgExtension", "camel.initialDPArgExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_gmscAddress,
@@ -9214,19 +9214,19 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "LowLayerCompatibility", HFILL }},
     { &hf_camel_enhancedDialledServicesAllowed,
-      { "enhancedDialledServicesAllowed", "camel.enhancedDialledServicesAllowed",
+      { "enhancedDialledServicesAllowed", "camel.enhancedDialledServicesAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_uu_Data,
-      { "uu-Data", "camel.uu_Data",
+      { "uu-Data", "camel.uu_Data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_collectInformationAllowed,
-      { "collectInformationAllowed", "camel.collectInformationAllowed",
+      { "collectInformationAllowed", "camel.collectInformationAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_releaseCallArgExtensionAllowed,
-      { "releaseCallArgExtensionAllowed", "camel.releaseCallArgExtensionAllowed",
+      { "releaseCallArgExtensionAllowed", "camel.releaseCallArgExtensionAllowed_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_legToBeCreated,
@@ -9242,7 +9242,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_camel_suppress_T_CSI,
-      { "suppress-T-CSI", "camel.suppress_T_CSI",
+      { "suppress-T-CSI", "camel.suppress_T_CSI_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_legIDToMove,
@@ -9254,7 +9254,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_allCallSegmentsWithExtension,
-      { "allCallSegmentsWithExtension", "camel.allCallSegmentsWithExtension",
+      { "allCallSegmentsWithExtension", "camel.allCallSegmentsWithExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_bcsmEvents,
@@ -9262,7 +9262,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_bound__numOfBCSMEvents_OF_BCSMEvent", HFILL }},
     { &hf_camel_bcsmEvents_item,
-      { "BCSMEvent", "camel.BCSMEvent",
+      { "BCSMEvent", "camel.BCSMEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_timerID,
@@ -9310,7 +9310,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_miscGPRSInfo,
-      { "miscGPRSInfo", "camel.miscGPRSInfo",
+      { "miscGPRSInfo", "camel.miscGPRSInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MiscCallInfo", HFILL }},
     { &hf_camel_gPRSEventSpecificInformation,
@@ -9322,7 +9322,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "ISDN_AddressString", HFILL }},
     { &hf_camel_gPRSMSClass,
-      { "gPRSMSClass", "camel.gPRSMSClass",
+      { "gPRSMSClass", "camel.gPRSMSClass_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_sGSNCapabilities,
@@ -9338,7 +9338,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_bound__numOfGPRSEvents_OF_GPRSEvent", HFILL }},
     { &hf_camel_gPRSEvent_item,
-      { "GPRSEvent", "camel.GPRSEvent",
+      { "GPRSEvent", "camel.GPRSEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_sCIGPRSBillingChargingCharacteristics,
@@ -9366,7 +9366,7 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "SMS_AddressString", HFILL }},
     { &hf_camel_locationInformationMSC,
-      { "locationInformationMSC", "camel.locationInformationMSC",
+      { "locationInformationMSC", "camel.locationInformationMSC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "LocationInformation", HFILL }},
     { &hf_camel_tPShortMessageSpecificInfo,
@@ -9398,11 +9398,11 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_bound__numOfSMSEvents_OF_SMSEvent", HFILL }},
     { &hf_camel_sMSEvents_item,
-      { "SMSEvent", "camel.SMSEvent",
+      { "SMSEvent", "camel.SMSEvent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_naCarrierInformation,
-      { "naCarrierInformation", "camel.naCarrierInformation",
+      { "naCarrierInformation", "camel.naCarrierInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_naCarrierId,
@@ -9414,11 +9414,11 @@ void proto_register_camel(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "NACarrierSelectionInfo", HFILL }},
     { &hf_camel_timeDurationCharging_01,
-      { "timeDurationCharging", "camel.timeDurationCharging",
+      { "timeDurationCharging", "camel.timeDurationCharging_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_timeDurationCharging_01", HFILL }},
     { &hf_camel_releaseIfdurationExceeded_01,
-      { "releaseIfdurationExceeded", "camel.releaseIfdurationExceeded",
+      { "releaseIfdurationExceeded", "camel.releaseIfdurationExceeded_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_tariffSwitchInterval,
@@ -9434,7 +9434,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField", HFILL }},
     { &hf_camel_extensions_item,
-      { "ExtensionField", "camel.ExtensionField",
+      { "ExtensionField", "camel.ExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_local,
@@ -9446,19 +9446,19 @@ void proto_register_camel(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_invoke,
-      { "invoke", "camel.invoke",
+      { "invoke", "camel.invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_returnResult,
-      { "returnResult", "camel.returnResult",
+      { "returnResult", "camel.returnResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_returnError,
-      { "returnError", "camel.returnError",
+      { "returnError", "camel.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_reject,
-      { "reject", "camel.reject",
+      { "reject", "camel.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_invokeId,
@@ -9474,7 +9474,7 @@ void proto_register_camel(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "T_linkedIdPresent", HFILL }},
     { &hf_camel_absent,
-      { "absent", "camel.absent",
+      { "absent", "camel.absent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_opcode,
@@ -9482,15 +9482,15 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_Code_vals), 0,
         "Code", HFILL }},
     { &hf_camel_argument,
-      { "argument", "camel.argument",
+      { "argument", "camel.argument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_result,
-      { "result", "camel.result",
+      { "result", "camel.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_resultArgument,
-      { "result", "camel.result",
+      { "result", "camel.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ResultArgument", HFILL }},
     { &hf_camel_errcode,
@@ -9498,7 +9498,7 @@ void proto_register_camel(void) {
         FT_UINT32, BASE_DEC, VALS(camel_Code_vals), 0,
         "Code", HFILL }},
     { &hf_camel_parameter,
-      { "parameter", "camel.parameter",
+      { "parameter", "camel.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_camel_problem,
index 3474b71d8d7776e49267be82414d2356297184e2..cc418ac0bbc7b7ef4a28e0055bf5494c6bbafd56 100644 (file)
@@ -371,7 +371,7 @@ void proto_register_cdt (void) {
 /*--- Included file: packet-cdt-hfarr.c ---*/
 #line 1 "../../asn1/cdt/packet-cdt-hfarr.c"
     { &hf_cdt_CompressedData_PDU,
-      { "CompressedData", "cdt.CompressedData",
+      { "CompressedData", "cdt.CompressedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cdt_compressionAlgorithm,
@@ -379,7 +379,7 @@ void proto_register_cdt (void) {
         FT_UINT32, BASE_DEC, VALS(cdt_CompressionAlgorithmIdentifier_vals), 0,
         "CompressionAlgorithmIdentifier", HFILL }},
     { &hf_cdt_compressedContentInfo,
-      { "compressedContentInfo", "cdt.compressedContentInfo",
+      { "compressedContentInfo", "cdt.compressedContentInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cdt_algorithmID_ShortForm,
index 5650e0ea8319ef220f0c4bdd8b68008911f33b61..8f3ff3ce4423379021283f159b26eab4b68ed181 100644 (file)
@@ -869,23 +869,23 @@ proto_register_charging_ase(void)
         FT_UINT32, BASE_DEC, VALS(charging_ase_ChargingMessageType_vals), 0,
         NULL, HFILL }},
     { &hf_charging_ase_crgt,
-      { "crgt", "charging_ase.crgt",
+      { "crgt", "charging_ase.crgt_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChargingTariffInformation", HFILL }},
     { &hf_charging_ase_aocrg,
-      { "aocrg", "charging_ase.aocrg",
+      { "aocrg", "charging_ase.aocrg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddOnChargingInformation", HFILL }},
     { &hf_charging_ase_crga,
-      { "crga", "charging_ase.crga",
+      { "crga", "charging_ase.crga_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChargingAcknowledgementInformation", HFILL }},
     { &hf_charging_ase_start,
-      { "start", "charging_ase.start",
+      { "start", "charging_ase.start_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StartCharging", HFILL }},
     { &hf_charging_ase_stop,
-      { "stop", "charging_ase.stop",
+      { "stop", "charging_ase.stop_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StopCharging", HFILL }},
     { &hf_charging_ase_acknowledgementIndicators,
@@ -897,15 +897,15 @@ proto_register_charging_ase(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_numOfExtensions_OF_ExtensionField", HFILL }},
     { &hf_charging_ase_extensions_item,
-      { "ExtensionField", "charging_ase.ExtensionField",
+      { "ExtensionField", "charging_ase.ExtensionField_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_originationIdentification,
-      { "originationIdentification", "charging_ase.originationIdentification",
+      { "originationIdentification", "charging_ase.originationIdentification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChargingReferenceIdentification", HFILL }},
     { &hf_charging_ase_destinationIdentification,
-      { "destinationIdentification", "charging_ase.destinationIdentification",
+      { "destinationIdentification", "charging_ase.destinationIdentification_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ChargingReferenceIdentification", HFILL }},
     { &hf_charging_ase_chargingControlIndicators,
@@ -917,7 +917,7 @@ proto_register_charging_ase(void)
         FT_UINT32, BASE_DEC, VALS(charging_ase_T_addOncharge_vals), 0,
         NULL, HFILL }},
     { &hf_charging_ase_addOnChargeCurrency,
-      { "addOnChargeCurrency", "charging_ase.addOnChargeCurrency",
+      { "addOnChargeCurrency", "charging_ase.addOnChargeCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CurrencyFactorScale", HFILL }},
     { &hf_charging_ase_addOnChargePulse,
@@ -933,11 +933,11 @@ proto_register_charging_ase(void)
         FT_UINT32, BASE_DEC, VALS(charging_ase_T_chargingTariff_vals), 0,
         NULL, HFILL }},
     { &hf_charging_ase_tariffCurrency,
-      { "tariffCurrency", "charging_ase.tariffCurrency",
+      { "tariffCurrency", "charging_ase.tariffCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_tariffPulse,
-      { "tariffPulse", "charging_ase.tariffPulse",
+      { "tariffPulse", "charging_ase.tariffPulse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_local,
@@ -949,7 +949,7 @@ proto_register_charging_ase(void)
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_charging_ase_currencyFactorScale,
-      { "currencyFactorScale", "charging_ase.currencyFactorScale",
+      { "currencyFactorScale", "charging_ase.currencyFactorScale_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_tariffDuration,
@@ -985,7 +985,7 @@ proto_register_charging_ase(void)
         FT_UINT32, BASE_DEC, VALS(charging_ase_CriticalityType_vals), 0,
         "CriticalityType", HFILL }},
     { &hf_charging_ase_value,
-      { "value", "charging_ase.value",
+      { "value", "charging_ase.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_networkOperators,
@@ -1001,15 +1001,15 @@ proto_register_charging_ase(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_currentTariffCurrency,
-      { "currentTariffCurrency", "charging_ase.currentTariffCurrency",
+      { "currentTariffCurrency", "charging_ase.currentTariffCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TariffCurrencyFormat", HFILL }},
     { &hf_charging_ase_tariffSwitchCurrency,
-      { "tariffSwitchCurrency", "charging_ase.tariffSwitchCurrency",
+      { "tariffSwitchCurrency", "charging_ase.tariffSwitchCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_nextTariffCurrency,
-      { "nextTariffCurrency", "charging_ase.nextTariffCurrency",
+      { "nextTariffCurrency", "charging_ase.nextTariffCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TariffCurrencyFormat", HFILL }},
     { &hf_charging_ase_tariffSwitchoverTime,
@@ -1021,7 +1021,7 @@ proto_register_charging_ase(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunicationTariffNum_OF_CommunicationChargeCurrency", HFILL }},
     { &hf_charging_ase_communicationChargeSequenceCurrency_item,
-      { "CommunicationChargeCurrency", "charging_ase.CommunicationChargeCurrency",
+      { "CommunicationChargeCurrency", "charging_ase.CommunicationChargeCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_tariffControlIndicators,
@@ -1029,23 +1029,23 @@ proto_register_charging_ase(void)
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_callAttemptChargeCurrency,
-      { "callAttemptChargeCurrency", "charging_ase.callAttemptChargeCurrency",
+      { "callAttemptChargeCurrency", "charging_ase.callAttemptChargeCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CurrencyFactorScale", HFILL }},
     { &hf_charging_ase_callSetupChargeCurrency,
-      { "callSetupChargeCurrency", "charging_ase.callSetupChargeCurrency",
+      { "callSetupChargeCurrency", "charging_ase.callSetupChargeCurrency_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CurrencyFactorScale", HFILL }},
     { &hf_charging_ase_currentTariffPulse,
-      { "currentTariffPulse", "charging_ase.currentTariffPulse",
+      { "currentTariffPulse", "charging_ase.currentTariffPulse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TariffPulseFormat", HFILL }},
     { &hf_charging_ase_tariffSwitchPulse,
-      { "tariffSwitchPulse", "charging_ase.tariffSwitchPulse",
+      { "tariffSwitchPulse", "charging_ase.tariffSwitchPulse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_nextTariffPulse,
-      { "nextTariffPulse", "charging_ase.nextTariffPulse",
+      { "nextTariffPulse", "charging_ase.nextTariffPulse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TariffPulseFormat", HFILL }},
     { &hf_charging_ase_communicationChargeSequencePulse,
@@ -1053,7 +1053,7 @@ proto_register_charging_ase(void)
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_minCommunicationTariffNum_maxCommunicationTariffNum_OF_CommunicationChargePulse", HFILL }},
     { &hf_charging_ase_communicationChargeSequencePulse_item,
-      { "CommunicationChargePulse", "charging_ase.CommunicationChargePulse",
+      { "CommunicationChargePulse", "charging_ase.CommunicationChargePulse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_charging_ase_tariffControlIndicators_01,
index 18c35139e216c36f71fa9e69d45c0a3311dd3fbd..df2820dcb70c76d51966f3ee6a27d72d0c102a09 100644 (file)
@@ -4479,7 +4479,7 @@ void proto_register_cmip(void) {
 /*--- Included file: packet-cmip-hfarr.c ---*/
 #line 1 "../../asn1/cmip/packet-cmip-hfarr.c"
     { &hf_cmip_BaseManagedObjectId_PDU,
-      { "BaseManagedObjectId", "cmip.BaseManagedObjectId",
+      { "BaseManagedObjectId", "cmip.BaseManagedObjectId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_EventTypeId_PDU,
@@ -4659,11 +4659,11 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_SecurityAlarmDetector_vals), 0,
         NULL, HFILL }},
     { &hf_cmip_ServiceProvider_PDU,
-      { "ServiceProvider", "cmip.ServiceProvider",
+      { "ServiceProvider", "cmip.ServiceProvider_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_ServiceUser_PDU,
-      { "ServiceUser", "cmip.ServiceUser",
+      { "ServiceUser", "cmip.ServiceUser_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_SimpleNameType_PDU,
@@ -4703,7 +4703,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_SystemTitle_vals), 0,
         NULL, HFILL }},
     { &hf_cmip_ThresholdInfo_PDU,
-      { "ThresholdInfo", "cmip.ThresholdInfo",
+      { "ThresholdInfo", "cmip.ThresholdInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_TrendIndication_PDU,
@@ -4739,7 +4739,7 @@ void proto_register_cmip(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_cmip_actionErroractionErrorInfo,
-      { "actionErrorInfo", "cmip.actionErrorInfo",
+      { "actionErrorInfo", "cmip.actionErrorInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_actionErrorInfo_errorStatus,
@@ -4763,15 +4763,15 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_InvalidArgumentValue_vals), 0,
         "InvalidArgumentValue", HFILL }},
     { &hf_cmip_actionInfoArg,
-      { "actionInfoArg", "cmip.actionInfoArg",
+      { "actionInfoArg", "cmip.actionInfoArg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_actionReplyInfo,
-      { "actionReplyInfo", "cmip.actionReplyInfo",
+      { "actionReplyInfo", "cmip.actionReplyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_actionReply,
-      { "actionReply", "cmip.actionReply",
+      { "actionReply", "cmip.actionReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_actionTypeId_globalForm,
@@ -4787,7 +4787,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
         "AttributeId", HFILL }},
     { &hf_cmip_value,
-      { "value", "cmip.value",
+      { "value", "cmip.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValue", HFILL }},
     { &hf_cmip_attributeError_errorStatus,
@@ -4803,7 +4803,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
         NULL, HFILL }},
     { &hf_cmip_attributeValue,
-      { "attributeValue", "cmip.attributeValue",
+      { "attributeValue", "cmip.attributeValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_attributeId_globalForm,
@@ -4823,7 +4823,7 @@ void proto_register_cmip(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_attributeValueAssertionvalue,
-      { "value", "cmip.value",
+      { "value", "cmip.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_attributeValueAssertionvalue", HFILL }},
     { &hf_cmip_baseManagedObjectClass,
@@ -4879,7 +4879,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         "ObjectInstance", HFILL }},
     { &hf_cmip_accessControl,
-      { "accessControl", "cmip.accessControl",
+      { "accessControl", "cmip.accessControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_referenceObjectInstance,
@@ -4891,7 +4891,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_cmip_attributeList_item,
-      { "Attribute", "cmip.Attribute",
+      { "Attribute", "cmip.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_deleteErrorInfo,
@@ -4903,7 +4903,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_EventTypeId_vals), 0,
         "EventTypeId", HFILL }},
     { &hf_cmip_eventReplyInfo,
-      { "eventReplyInfo", "cmip.eventReplyInfo",
+      { "eventReplyInfo", "cmip.eventReplyInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_eventTime,
@@ -4911,11 +4911,11 @@ void proto_register_cmip(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_cmip_eventReportArgumenteventInfo,
-      { "eventInfo", "cmip.eventInfo",
+      { "eventInfo", "cmip.eventInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EventReportArgumentEventInfo", HFILL }},
     { &hf_cmip_eventReply,
-      { "eventReply", "cmip.eventReply",
+      { "eventReply", "cmip.eventReply_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_eventTypeId_globalForm,
@@ -4923,7 +4923,7 @@ void proto_register_cmip(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "T_eventTypeId_globalForm", HFILL }},
     { &hf_cmip_equality,
-      { "equality", "cmip.equality",
+      { "equality", "cmip.equality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_substrings,
@@ -4935,23 +4935,23 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_T_substrings_item_vals), 0,
         NULL, HFILL }},
     { &hf_cmip_initialString,
-      { "initialString", "cmip.initialString",
+      { "initialString", "cmip.initialString_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_anyString,
-      { "anyString", "cmip.anyString",
+      { "anyString", "cmip.anyString_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_finalString,
-      { "finalString", "cmip.finalString",
+      { "finalString", "cmip.finalString_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_greaterOrEqual,
-      { "greaterOrEqual", "cmip.greaterOrEqual",
+      { "greaterOrEqual", "cmip.greaterOrEqual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_lessOrEqual,
-      { "lessOrEqual", "cmip.lessOrEqual",
+      { "lessOrEqual", "cmip.lessOrEqual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_filterItempresent,
@@ -4959,23 +4959,23 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
         "AttributeId", HFILL }},
     { &hf_cmip_subsetOf,
-      { "subsetOf", "cmip.subsetOf",
+      { "subsetOf", "cmip.subsetOf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_supersetOf,
-      { "supersetOf", "cmip.supersetOf",
+      { "supersetOf", "cmip.supersetOf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_nonNullSetIntersection,
-      { "nonNullSetIntersection", "cmip.nonNullSetIntersection",
+      { "nonNullSetIntersection", "cmip.nonNullSetIntersection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_cmip_attributeIdError,
-      { "attributeIdError", "cmip.attributeIdError",
+      { "attributeIdError", "cmip.attributeIdError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_attribute,
-      { "attribute", "cmip.attribute",
+      { "attribute", "cmip.attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_getInfoList,
@@ -4987,59 +4987,59 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_GetInfoStatus_vals), 0,
         NULL, HFILL }},
     { &hf_cmip_actionValue,
-      { "actionValue", "cmip.actionValue",
+      { "actionValue", "cmip.actionValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ActionInfo", HFILL }},
     { &hf_cmip_eventValue,
-      { "eventValue", "cmip.eventValue",
+      { "eventValue", "cmip.eventValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_eventInfo,
-      { "eventInfo", "cmip.eventInfo",
+      { "eventInfo", "cmip.eventInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_getResult,
-      { "getResult", "cmip.getResult",
+      { "getResult", "cmip.getResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_getListError,
-      { "getListError", "cmip.getListError",
+      { "getListError", "cmip.getListError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_setResult,
-      { "setResult", "cmip.setResult",
+      { "setResult", "cmip.setResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_setListError,
-      { "setListError", "cmip.setListError",
+      { "setListError", "cmip.setListError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_actionResult,
-      { "actionResult", "cmip.actionResult",
+      { "actionResult", "cmip.actionResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_processingFailure,
-      { "processingFailure", "cmip.processingFailure",
+      { "processingFailure", "cmip.processingFailure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_deleteResult,
-      { "deleteResult", "cmip.deleteResult",
+      { "deleteResult", "cmip.deleteResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_actionError,
-      { "actionError", "cmip.actionError",
+      { "actionError", "cmip.actionError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_deleteError,
-      { "deleteError", "cmip.deleteError",
+      { "deleteError", "cmip.deleteError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_actionId,
-      { "actionId", "cmip.actionId",
+      { "actionId", "cmip.actionId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_eventId,
-      { "eventId", "cmip.eventId",
+      { "eventId", "cmip.eventId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_objectClass_globalForm,
@@ -5063,7 +5063,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RDNSequence", HFILL }},
     { &hf_cmip_specificErrorInfo,
-      { "specificErrorInfo", "cmip.specificErrorInfo",
+      { "specificErrorInfo", "cmip.specificErrorInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_RDNSequence_item,
@@ -5071,7 +5071,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_RelativeDistinguishedName_item,
-      { "AttributeValueAssertion", "cmip.AttributeValueAssertion",
+      { "AttributeValueAssertion", "cmip.AttributeValueAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_namedNumbers,
@@ -5087,7 +5087,7 @@ void proto_register_cmip(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_cmip_attributeError,
-      { "attributeError", "cmip.attributeError",
+      { "attributeError", "cmip.attributeError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_setInfoList,
@@ -5103,7 +5103,7 @@ void proto_register_cmip(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_errorInfo,
-      { "errorInfo", "cmip.errorInfo",
+      { "errorInfo", "cmip.errorInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_abortSource,
@@ -5111,7 +5111,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_CMIPAbortSource_vals), 0,
         "CMIPAbortSource", HFILL }},
     { &hf_cmip_userInfo,
-      { "userInfo", "cmip.userInfo",
+      { "userInfo", "cmip.userInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_cmip_protocolVersion,
@@ -5123,11 +5123,11 @@ void proto_register_cmip(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_cmipUserInfoaccessControl,
-      { "accessControl", "cmip.accessControl",
+      { "accessControl", "cmip.accessControl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_cmip_AdditionalInformation_item,
-      { "ManagementExtension", "cmip.ManagementExtension",
+      { "ManagementExtension", "cmip.ManagementExtension_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_Allomorphs_item,
@@ -5139,19 +5139,19 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_AttributeId_vals), 0,
         NULL, HFILL }},
     { &hf_cmip_AttributeList_item,
-      { "Attribute", "cmip.Attribute",
+      { "Attribute", "cmip.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_AttributeValueChangeDefinition_item,
-      { "AttributeValueChangeDefinition item", "cmip.AttributeValueChangeDefinition_item",
+      { "AttributeValueChangeDefinition item", "cmip.AttributeValueChangeDefinition_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_oldAttributeValue,
-      { "oldAttributeValue", "cmip.oldAttributeValue",
+      { "oldAttributeValue", "cmip.oldAttributeValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_newAttributeValue,
-      { "newAttributeValue", "cmip.newAttributeValue",
+      { "newAttributeValue", "cmip.newAttributeValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_AlarmStatus_item,
@@ -5171,7 +5171,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         "ObjectInstance", HFILL }},
     { &hf_cmip_noObject,
-      { "noObject", "cmip.noObject",
+      { "noObject", "cmip.noObject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_CapacityAlarmThreshold_item,
@@ -5183,7 +5183,7 @@ void proto_register_cmip(void) {
         FT_INT32, BASE_DEC, VALS(cmip_ControlStatus_item_vals), 0,
         NULL, HFILL }},
     { &hf_cmip_CorrelatedNotifications_item,
-      { "CorrelatedNotifications item", "cmip.CorrelatedNotifications_item",
+      { "CorrelatedNotifications item", "cmip.CorrelatedNotifications_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_correlatedNotifications,
@@ -5215,15 +5215,15 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObjectInstance_vals), 0,
         NULL, HFILL }},
     { &hf_cmip_IntervalsOfDay_item,
-      { "IntervalsOfDay item", "cmip.IntervalsOfDay_item",
+      { "IntervalsOfDay item", "cmip.IntervalsOfDay_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_intervalStart,
-      { "intervalStart", "cmip.intervalStart",
+      { "intervalStart", "cmip.intervalStart_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Time24", HFILL }},
     { &hf_cmip_intervalEnd,
-      { "intervalEnd", "cmip.intervalEnd",
+      { "intervalEnd", "cmip.intervalEnd_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Time24", HFILL }},
     { &hf_cmip_managementExtensionidentifier,
@@ -5235,11 +5235,11 @@ void proto_register_cmip(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_cmip_information,
-      { "information", "cmip.information",
+      { "information", "cmip.information_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_MonitoredAttributes_item,
-      { "Attribute", "cmip.Attribute",
+      { "Attribute", "cmip.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_integer,
@@ -5255,7 +5255,7 @@ void proto_register_cmip(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_PrioritisedObject_item,
-      { "PrioritisedObject item", "cmip.PrioritisedObject_item",
+      { "PrioritisedObject item", "cmip.PrioritisedObject_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_object,
@@ -5295,7 +5295,7 @@ void proto_register_cmip(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "T_serviceUseridentifier", HFILL }},
     { &hf_cmip_details,
-      { "details", "cmip.details",
+      { "details", "cmip.details_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_number,
@@ -5323,11 +5323,11 @@ void proto_register_cmip(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_cmip_continual,
-      { "continual", "cmip.continual",
+      { "continual", "cmip.continual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_SupportedFeatures_item,
-      { "SupportedFeatures item", "cmip.SupportedFeatures_item",
+      { "SupportedFeatures item", "cmip.SupportedFeatures_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_featureIdentifier,
@@ -5335,7 +5335,7 @@ void proto_register_cmip(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_featureInfo,
-      { "featureInfo", "cmip.featureInfo",
+      { "featureInfo", "cmip.featureInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_name,
@@ -5343,7 +5343,7 @@ void proto_register_cmip(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GraphicString", HFILL }},
     { &hf_cmip_nothing,
-      { "nothing", "cmip.nothing",
+      { "nothing", "cmip.nothing_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_oid,
@@ -5375,7 +5375,7 @@ void proto_register_cmip(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_cmip_up,
-      { "up", "cmip.up",
+      { "up", "cmip.up_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_high,
@@ -5387,11 +5387,11 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_ObservedValue_vals), 0,
         "ObservedValue", HFILL }},
     { &hf_cmip_down,
-      { "down", "cmip.down",
+      { "down", "cmip.down_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_WeekMask_item,
-      { "WeekMask item", "cmip.WeekMask_item",
+      { "WeekMask item", "cmip.WeekMask_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_daysOfWeek,
@@ -5411,19 +5411,19 @@ void proto_register_cmip(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_cmip_invoke,
-      { "invoke", "cmip.invoke",
+      { "invoke", "cmip.invoke_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_returnResult,
-      { "returnResult", "cmip.returnResult",
+      { "returnResult", "cmip.returnResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_returnError,
-      { "returnError", "cmip.returnError",
+      { "returnError", "cmip.returnError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_reject,
-      { "reject", "cmip.reject",
+      { "reject", "cmip.reject_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_invokeId,
@@ -5439,7 +5439,7 @@ void proto_register_cmip(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "T_linkedIdPresent", HFILL }},
     { &hf_cmip_absent,
-      { "absent", "cmip.absent",
+      { "absent", "cmip.absent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_opcode,
@@ -5447,15 +5447,15 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_Code_vals), 0,
         "Code", HFILL }},
     { &hf_cmip_argument,
-      { "argument", "cmip.argument",
+      { "argument", "cmip.argument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "InvokeArgument", HFILL }},
     { &hf_cmip_result,
-      { "result", "cmip.result",
+      { "result", "cmip.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_resultArgument,
-      { "result", "cmip.result",
+      { "result", "cmip.result_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ResultArgument", HFILL }},
     { &hf_cmip_errcode,
@@ -5463,7 +5463,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_Code_vals), 0,
         "Code", HFILL }},
     { &hf_cmip_parameter,
-      { "parameter", "cmip.parameter",
+      { "parameter", "cmip.parameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_problem,
@@ -5495,7 +5495,7 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, VALS(cmip_CMISSync_vals), 0,
         "CMISSync", HFILL }},
     { &hf_cmip_actionInfo,
-      { "actionInfo", "cmip.actionInfo",
+      { "actionInfo", "cmip.actionInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_attributeIdList,
@@ -5511,11 +5511,11 @@ void proto_register_cmip(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_modificationList_item,
-      { "modificationList item", "cmip.modificationList_item",
+      { "modificationList item", "cmip.modificationList_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "T_modificationList_item", HFILL }},
     { &hf_cmip_attributevalue,
-      { "attributeValue", "cmip.attributeValue",
+      { "attributeValue", "cmip.attributeValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmip_InvokeId_present,
index 2c234c592a87ef88e1db03da717e08634ec7f706..96e6b5d5daa7beec1a76d63a12aed2749c9c3daf 100644 (file)
@@ -1714,11 +1714,11 @@ void proto_register_cmp(void) {
 /*--- Included file: packet-cmp-hfarr.c ---*/
 #line 1 "../../asn1/cmp/packet-cmp-hfarr.c"
     { &hf_cmp_PBMParameter_PDU,
-      { "PBMParameter", "cmp.PBMParameter",
+      { "PBMParameter", "cmp.PBMParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_DHBMParameter_PDU,
-      { "DHBMParameter", "cmp.DHBMParameter",
+      { "DHBMParameter", "cmp.DHBMParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_CAProtEncCertValue_PDU,
@@ -1734,15 +1734,15 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_PreferredSymmAlgValue_PDU,
-      { "PreferredSymmAlgValue", "cmp.PreferredSymmAlgValue",
+      { "PreferredSymmAlgValue", "cmp.PreferredSymmAlgValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_CAKeyUpdateInfoValue_PDU,
-      { "CAKeyUpdateInfoValue", "cmp.CAKeyUpdateInfoValue",
+      { "CAKeyUpdateInfoValue", "cmp.CAKeyUpdateInfoValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_CurrentCRLValue_PDU,
-      { "CurrentCRLValue", "cmp.CurrentCRLValue",
+      { "CurrentCRLValue", "cmp.CurrentCRLValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_UnsupportedOIDsValue_PDU,
@@ -1754,15 +1754,15 @@ void proto_register_cmp(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_KeyPairParamRepValue_PDU,
-      { "KeyPairParamRepValue", "cmp.KeyPairParamRepValue",
+      { "KeyPairParamRepValue", "cmp.KeyPairParamRepValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_RevPassphraseValue_PDU,
-      { "RevPassphraseValue", "cmp.RevPassphraseValue",
+      { "RevPassphraseValue", "cmp.RevPassphraseValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_ImplicitConfirmValue_PDU,
-      { "ImplicitConfirmValue", "cmp.ImplicitConfirmValue",
+      { "ImplicitConfirmValue", "cmp.ImplicitConfirmValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_ConfirmWaitTimeValue_PDU,
@@ -1778,11 +1778,11 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_x509v3PKCert,
-      { "x509v3PKCert", "cmp.x509v3PKCert",
+      { "x509v3PKCert", "cmp.x509v3PKCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Certificate", HFILL }},
     { &hf_cmp_header,
-      { "header", "cmp.header",
+      { "header", "cmp.header_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKIHeader", HFILL }},
     { &hf_cmp_body,
@@ -1802,7 +1802,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0,
         NULL, HFILL }},
     { &hf_cmp_PKIMessages_item,
-      { "PKIMessage", "cmp.PKIMessage",
+      { "PKIMessage", "cmp.PKIMessage_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_pvno,
@@ -1822,7 +1822,7 @@ void proto_register_cmp(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_cmp_protectionAlg,
-      { "protectionAlg", "cmp.protectionAlg",
+      { "protectionAlg", "cmp.protectionAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_cmp_senderKID,
@@ -1854,7 +1854,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_InfoTypeAndValue", HFILL }},
     { &hf_cmp_generalInfo_item,
-      { "InfoTypeAndValue", "cmp.InfoTypeAndValue",
+      { "InfoTypeAndValue", "cmp.InfoTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_PKIFreeText_item,
@@ -1866,7 +1866,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CertReqMessages", HFILL }},
     { &hf_cmp_ip,
-      { "ip", "cmp.ip",
+      { "ip", "cmp.ip_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertRepMessage", HFILL }},
     { &hf_cmp_cr,
@@ -1874,11 +1874,11 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CertReqMessages", HFILL }},
     { &hf_cmp_cp,
-      { "cp", "cmp.cp",
+      { "cp", "cmp.cp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertRepMessage", HFILL }},
     { &hf_cmp_p10cr,
-      { "p10cr", "cmp.p10cr",
+      { "p10cr", "cmp.p10cr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_popdecc,
@@ -1894,7 +1894,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CertReqMessages", HFILL }},
     { &hf_cmp_kup,
-      { "kup", "cmp.kup",
+      { "kup", "cmp.kup_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertRepMessage", HFILL }},
     { &hf_cmp_krr,
@@ -1902,7 +1902,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CertReqMessages", HFILL }},
     { &hf_cmp_krp,
-      { "krp", "cmp.krp",
+      { "krp", "cmp.krp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KeyRecRepContent", HFILL }},
     { &hf_cmp_rr,
@@ -1910,7 +1910,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "RevReqContent", HFILL }},
     { &hf_cmp_rp,
-      { "rp", "cmp.rp",
+      { "rp", "cmp.rp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RevRepContent", HFILL }},
     { &hf_cmp_ccr,
@@ -1918,11 +1918,11 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CertReqMessages", HFILL }},
     { &hf_cmp_ccp,
-      { "ccp", "cmp.ccp",
+      { "ccp", "cmp.ccp_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertRepMessage", HFILL }},
     { &hf_cmp_ckuann,
-      { "ckuann", "cmp.ckuann",
+      { "ckuann", "cmp.ckuann_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CAKeyUpdAnnContent", HFILL }},
     { &hf_cmp_cann,
@@ -1930,7 +1930,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0,
         "CertAnnContent", HFILL }},
     { &hf_cmp_rann,
-      { "rann", "cmp.rann",
+      { "rann", "cmp.rann_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RevAnnContent", HFILL }},
     { &hf_cmp_crlann,
@@ -1938,7 +1938,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "CRLAnnContent", HFILL }},
     { &hf_cmp_pkiconf,
-      { "pkiconf", "cmp.pkiconf",
+      { "pkiconf", "cmp.pkiconf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKIConfirmContent", HFILL }},
     { &hf_cmp_nested,
@@ -1954,7 +1954,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GenRepContent", HFILL }},
     { &hf_cmp_error,
-      { "error", "cmp.error",
+      { "error", "cmp.error_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ErrorMsgContent", HFILL }},
     { &hf_cmp_certConf,
@@ -1974,7 +1974,7 @@ void proto_register_cmp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_cmp_owf,
-      { "owf", "cmp.owf",
+      { "owf", "cmp.owf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_cmp_iterationCount,
@@ -1982,7 +1982,7 @@ void proto_register_cmp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_cmp_mac,
-      { "mac", "cmp.mac",
+      { "mac", "cmp.mac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_cmp_pkistatus,
@@ -1998,11 +1998,11 @@ void proto_register_cmp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "PKIFailureInfo", HFILL }},
     { &hf_cmp_hashAlg,
-      { "hashAlg", "cmp.hashAlg",
+      { "hashAlg", "cmp.hashAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_cmp_certId,
-      { "certId", "cmp.certId",
+      { "certId", "cmp.certId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_hashVal,
@@ -2010,7 +2010,7 @@ void proto_register_cmp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_cmp_POPODecKeyChallContent_item,
-      { "Challenge", "cmp.Challenge",
+      { "Challenge", "cmp.Challenge_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_witness,
@@ -2038,7 +2038,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_CertResponse", HFILL }},
     { &hf_cmp_response_item,
-      { "CertResponse", "cmp.CertResponse",
+      { "CertResponse", "cmp.CertResponse_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_certReqId,
@@ -2046,11 +2046,11 @@ void proto_register_cmp(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_cmp_pkistatusinf,
-      { "status", "cmp.status",
+      { "status", "cmp.status_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKIStatusInfo", HFILL }},
     { &hf_cmp_certifiedKeyPair,
-      { "certifiedKeyPair", "cmp.certifiedKeyPair",
+      { "certifiedKeyPair", "cmp.certifiedKeyPair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_rspInfo,
@@ -2062,11 +2062,11 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, VALS(cmp_CertOrEncCert_vals), 0,
         NULL, HFILL }},
     { &hf_cmp_privateKey,
-      { "privateKey", "cmp.privateKey",
+      { "privateKey", "cmp.privateKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncryptedValue", HFILL }},
     { &hf_cmp_publicationInfo,
-      { "publicationInfo", "cmp.publicationInfo",
+      { "publicationInfo", "cmp.publicationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKIPublicationInfo", HFILL }},
     { &hf_cmp_certificate,
@@ -2074,7 +2074,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, VALS(cmp_CMPCertificate_vals), 0,
         "CMPCertificate", HFILL }},
     { &hf_cmp_encryptedCert,
-      { "encryptedCert", "cmp.encryptedCert",
+      { "encryptedCert", "cmp.encryptedCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncryptedValue", HFILL }},
     { &hf_cmp_newSigCert,
@@ -2094,15 +2094,15 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_CertifiedKeyPair", HFILL }},
     { &hf_cmp_keyPairHist_item,
-      { "CertifiedKeyPair", "cmp.CertifiedKeyPair",
+      { "CertifiedKeyPair", "cmp.CertifiedKeyPair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_RevReqContent_item,
-      { "RevDetails", "cmp.RevDetails",
+      { "RevDetails", "cmp.RevDetails_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_certDetails,
-      { "certDetails", "cmp.certDetails",
+      { "certDetails", "cmp.certDetails_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertTemplate", HFILL }},
     { &hf_cmp_crlEntryDetails,
@@ -2114,7 +2114,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_PKIStatusInfo", HFILL }},
     { &hf_cmp_rvrpcnt_status_item,
-      { "PKIStatusInfo", "cmp.PKIStatusInfo",
+      { "PKIStatusInfo", "cmp.PKIStatusInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_revCerts,
@@ -2122,7 +2122,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_CertId", HFILL }},
     { &hf_cmp_revCerts_item,
-      { "CertId", "cmp.CertId",
+      { "CertId", "cmp.CertId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_crls,
@@ -2130,7 +2130,7 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_CertificateList", HFILL }},
     { &hf_cmp_crls_item,
-      { "CertificateList", "cmp.CertificateList",
+      { "CertificateList", "cmp.CertificateList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_oldWithNew,
@@ -2158,11 +2158,11 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Extensions", HFILL }},
     { &hf_cmp_CRLAnnContent_item,
-      { "CertificateList", "cmp.CertificateList",
+      { "CertificateList", "cmp.CertificateList_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_CertConfirmContent_item,
-      { "CertStatus", "cmp.CertStatus",
+      { "CertStatus", "cmp.CertStatus_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_certHash,
@@ -2170,7 +2170,7 @@ void proto_register_cmp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_cmp_statusInfo,
-      { "statusInfo", "cmp.statusInfo",
+      { "statusInfo", "cmp.statusInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKIStatusInfo", HFILL }},
     { &hf_cmp_infoType,
@@ -2178,15 +2178,15 @@ void proto_register_cmp(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_infoValue,
-      { "infoValue", "cmp.infoValue",
+      { "infoValue", "cmp.infoValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_SignKeyPairTypesValue_item,
-      { "AlgorithmIdentifier", "cmp.AlgorithmIdentifier",
+      { "AlgorithmIdentifier", "cmp.AlgorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_EncKeyPairTypesValue_item,
-      { "AlgorithmIdentifier", "cmp.AlgorithmIdentifier",
+      { "AlgorithmIdentifier", "cmp.AlgorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_UnsupportedOIDsValue_item,
@@ -2198,15 +2198,15 @@ void proto_register_cmp(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "UTF8String", HFILL }},
     { &hf_cmp_GenMsgContent_item,
-      { "InfoTypeAndValue", "cmp.InfoTypeAndValue",
+      { "InfoTypeAndValue", "cmp.InfoTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_GenRepContent_item,
-      { "InfoTypeAndValue", "cmp.InfoTypeAndValue",
+      { "InfoTypeAndValue", "cmp.InfoTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_pKIStatusInfo,
-      { "pKIStatusInfo", "cmp.pKIStatusInfo",
+      { "pKIStatusInfo", "cmp.pKIStatusInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_errorCode,
@@ -2218,11 +2218,11 @@ void proto_register_cmp(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "PKIFreeText", HFILL }},
     { &hf_cmp_PollReqContent_item,
-      { "PollReqContent item", "cmp.PollReqContent_item",
+      { "PollReqContent item", "cmp.PollReqContent_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_PollRepContent_item,
-      { "PollRepContent item", "cmp.PollRepContent_item",
+      { "PollRepContent item", "cmp.PollRepContent_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cmp_checkAfter,
index 0b5a4a2cd7a398af1658c9f3db1ea6afa1e5dd81..f960e0365588174c2a3cc80ec584e90bd818d739 100644 (file)
@@ -1838,7 +1838,7 @@ void proto_register_cms(void) {
 /*--- Included file: packet-cms-hfarr.c ---*/
 #line 1 "../../asn1/cms/packet-cms-hfarr.c"
     { &hf_cms_ContentInfo_PDU,
-      { "ContentInfo", "cms.ContentInfo",
+      { "ContentInfo", "cms.ContentInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_ContentType_PDU,
@@ -1846,27 +1846,27 @@ void proto_register_cms(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_SignedData_PDU,
-      { "SignedData", "cms.SignedData",
+      { "SignedData", "cms.SignedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_EnvelopedData_PDU,
-      { "EnvelopedData", "cms.EnvelopedData",
+      { "EnvelopedData", "cms.EnvelopedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_DigestedData_PDU,
-      { "DigestedData", "cms.DigestedData",
+      { "DigestedData", "cms.DigestedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_EncryptedData_PDU,
-      { "EncryptedData", "cms.EncryptedData",
+      { "EncryptedData", "cms.EncryptedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_AuthenticatedData_PDU,
-      { "AuthenticatedData", "cms.AuthenticatedData",
+      { "AuthenticatedData", "cms.AuthenticatedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_IssuerAndSerialNumber_PDU,
-      { "IssuerAndSerialNumber", "cms.IssuerAndSerialNumber",
+      { "IssuerAndSerialNumber", "cms.IssuerAndSerialNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_MessageDigest_PDU,
@@ -1878,7 +1878,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, VALS(cms_Time_vals), 0,
         NULL, HFILL }},
     { &hf_cms_Countersignature_PDU,
-      { "Countersignature", "cms.Countersignature",
+      { "Countersignature", "cms.Countersignature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_RC2WrapParameter_PDU,
@@ -1902,7 +1902,7 @@ void proto_register_cms(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_content,
-      { "content", "cms.content",
+      { "content", "cms.content_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_version,
@@ -1914,7 +1914,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DigestAlgorithmIdentifiers", HFILL }},
     { &hf_cms_encapContentInfo,
-      { "encapContentInfo", "cms.encapContentInfo",
+      { "encapContentInfo", "cms.encapContentInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EncapsulatedContentInfo", HFILL }},
     { &hf_cms_certificates,
@@ -1930,11 +1930,11 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_DigestAlgorithmIdentifiers_item,
-      { "DigestAlgorithmIdentifier", "cms.DigestAlgorithmIdentifier",
+      { "DigestAlgorithmIdentifier", "cms.DigestAlgorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_SignerInfos_item,
-      { "SignerInfo", "cms.SignerInfo",
+      { "SignerInfo", "cms.SignerInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_eContentType,
@@ -1950,7 +1950,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, VALS(cms_SignerIdentifier_vals), 0,
         "SignerIdentifier", HFILL }},
     { &hf_cms_digestAlgorithm,
-      { "digestAlgorithm", "cms.digestAlgorithm",
+      { "digestAlgorithm", "cms.digestAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DigestAlgorithmIdentifier", HFILL }},
     { &hf_cms_signedAttrs,
@@ -1958,7 +1958,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SignedAttributes", HFILL }},
     { &hf_cms_signatureAlgorithm,
-      { "signatureAlgorithm", "cms.signatureAlgorithm",
+      { "signatureAlgorithm", "cms.signatureAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SignatureAlgorithmIdentifier", HFILL }},
     { &hf_cms_signatureValue,
@@ -1970,7 +1970,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UnsignedAttributes", HFILL }},
     { &hf_cms_issuerAndSerialNumber,
-      { "issuerAndSerialNumber", "cms.issuerAndSerialNumber",
+      { "issuerAndSerialNumber", "cms.issuerAndSerialNumber_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_subjectKeyIdentifier,
@@ -1978,11 +1978,11 @@ void proto_register_cms(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_SignedAttributes_item,
-      { "Attribute", "cms.Attribute",
+      { "Attribute", "cms.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_UnsignedAttributes_item,
-      { "Attribute", "cms.Attribute",
+      { "Attribute", "cms.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_attrType,
@@ -1994,11 +1994,11 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_AttributeValue", HFILL }},
     { &hf_cms_attrValues_item,
-      { "AttributeValue", "cms.AttributeValue",
+      { "AttributeValue", "cms.AttributeValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_originatorInfo,
-      { "originatorInfo", "cms.originatorInfo",
+      { "originatorInfo", "cms.originatorInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_recipientInfos,
@@ -2006,7 +2006,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_encryptedContentInfo,
-      { "encryptedContentInfo", "cms.encryptedContentInfo",
+      { "encryptedContentInfo", "cms.encryptedContentInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_unprotectedAttrs,
@@ -2026,7 +2026,7 @@ void proto_register_cms(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_contentEncryptionAlgorithm,
-      { "contentEncryptionAlgorithm", "cms.contentEncryptionAlgorithm",
+      { "contentEncryptionAlgorithm", "cms.contentEncryptionAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ContentEncryptionAlgorithmIdentifier", HFILL }},
     { &hf_cms_encryptedContent,
@@ -2034,27 +2034,27 @@ void proto_register_cms(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_UnprotectedAttributes_item,
-      { "Attribute", "cms.Attribute",
+      { "Attribute", "cms.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_ktri,
-      { "ktri", "cms.ktri",
+      { "ktri", "cms.ktri_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KeyTransRecipientInfo", HFILL }},
     { &hf_cms_kari,
-      { "kari", "cms.kari",
+      { "kari", "cms.kari_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KeyAgreeRecipientInfo", HFILL }},
     { &hf_cms_kekri,
-      { "kekri", "cms.kekri",
+      { "kekri", "cms.kekri_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KEKRecipientInfo", HFILL }},
     { &hf_cms_pwri,
-      { "pwri", "cms.pwri",
+      { "pwri", "cms.pwri_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PasswordRecipientInfo", HFILL }},
     { &hf_cms_ori,
-      { "ori", "cms.ori",
+      { "ori", "cms.ori_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OtherRecipientInfo", HFILL }},
     { &hf_cms_rid,
@@ -2062,7 +2062,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, VALS(cms_RecipientIdentifier_vals), 0,
         "RecipientIdentifier", HFILL }},
     { &hf_cms_keyEncryptionAlgorithm,
-      { "keyEncryptionAlgorithm", "cms.keyEncryptionAlgorithm",
+      { "keyEncryptionAlgorithm", "cms.keyEncryptionAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KeyEncryptionAlgorithmIdentifier", HFILL }},
     { &hf_cms_encryptedKey,
@@ -2082,11 +2082,11 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_originatorKey,
-      { "originatorKey", "cms.originatorKey",
+      { "originatorKey", "cms.originatorKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OriginatorPublicKey", HFILL }},
     { &hf_cms_algorithm,
-      { "algorithm", "cms.algorithm",
+      { "algorithm", "cms.algorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_cms_publicKey,
@@ -2094,7 +2094,7 @@ void proto_register_cms(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_cms_RecipientEncryptedKeys_item,
-      { "RecipientEncryptedKey", "cms.RecipientEncryptedKey",
+      { "RecipientEncryptedKey", "cms.RecipientEncryptedKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_rekRid,
@@ -2102,7 +2102,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, VALS(cms_KeyAgreeRecipientIdentifier_vals), 0,
         "KeyAgreeRecipientIdentifier", HFILL }},
     { &hf_cms_rKeyId,
-      { "rKeyId", "cms.rKeyId",
+      { "rKeyId", "cms.rKeyId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RecipientKeyIdentifier", HFILL }},
     { &hf_cms_date,
@@ -2110,11 +2110,11 @@ void proto_register_cms(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         "GeneralizedTime", HFILL }},
     { &hf_cms_other,
-      { "other", "cms.other",
+      { "other", "cms.other_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OtherKeyAttribute", HFILL }},
     { &hf_cms_kekid,
-      { "kekid", "cms.kekid",
+      { "kekid", "cms.kekid_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KEKIdentifier", HFILL }},
     { &hf_cms_keyIdentifier,
@@ -2122,7 +2122,7 @@ void proto_register_cms(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_cms_keyDerivationAlgorithm,
-      { "keyDerivationAlgorithm", "cms.keyDerivationAlgorithm",
+      { "keyDerivationAlgorithm", "cms.keyDerivationAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "KeyDerivationAlgorithmIdentifier", HFILL }},
     { &hf_cms_oriType,
@@ -2130,7 +2130,7 @@ void proto_register_cms(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_oriValue,
-      { "oriValue", "cms.oriValue",
+      { "oriValue", "cms.oriValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_digest,
@@ -2138,7 +2138,7 @@ void proto_register_cms(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_macAlgorithm,
-      { "macAlgorithm", "cms.macAlgorithm",
+      { "macAlgorithm", "cms.macAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MessageAuthenticationCodeAlgorithm", HFILL }},
     { &hf_cms_authAttrs,
@@ -2154,11 +2154,11 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UnauthAttributes", HFILL }},
     { &hf_cms_AuthAttributes_item,
-      { "Attribute", "cms.Attribute",
+      { "Attribute", "cms.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_UnauthAttributes_item,
-      { "Attribute", "cms.Attribute",
+      { "Attribute", "cms.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_RevocationInfoChoices_item,
@@ -2166,11 +2166,11 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, VALS(cms_RevocationInfoChoice_vals), 0,
         NULL, HFILL }},
     { &hf_cms_crl,
-      { "crl", "cms.crl",
+      { "crl", "cms.crl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificateList", HFILL }},
     { &hf_cms_otherRIC,
-      { "other", "cms.other",
+      { "other", "cms.other_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OtherRevocationInfoFormat", HFILL }},
     { &hf_cms_otherRevInfoFormat,
@@ -2178,23 +2178,23 @@ void proto_register_cms(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_otherRevInfo,
-      { "otherRevInfo", "cms.otherRevInfo",
+      { "otherRevInfo", "cms.otherRevInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_certificate,
-      { "certificate", "cms.certificate",
+      { "certificate", "cms.certificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_extendedCertificate,
-      { "extendedCertificate", "cms.extendedCertificate",
+      { "extendedCertificate", "cms.extendedCertificate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_v1AttrCert,
-      { "v1AttrCert", "cms.v1AttrCert",
+      { "v1AttrCert", "cms.v1AttrCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCertificateV1", HFILL }},
     { &hf_cms_v2AttrCert,
-      { "v2AttrCert", "cms.v2AttrCert",
+      { "v2AttrCert", "cms.v2AttrCert_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCertificateV2", HFILL }},
     { &hf_cms_CertificateSet_item,
@@ -2214,7 +2214,7 @@ void proto_register_cms(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_keyAttr,
-      { "keyAttr", "cms.keyAttr",
+      { "keyAttr", "cms.keyAttr_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_utcTime,
@@ -2234,7 +2234,7 @@ void proto_register_cms(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_cms_extendedCertificateInfo,
-      { "extendedCertificateInfo", "cms.extendedCertificateInfo",
+      { "extendedCertificateInfo", "cms.extendedCertificateInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_signature,
@@ -2246,7 +2246,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "UnauthAttributes", HFILL }},
     { &hf_cms_SMIMECapabilities_item,
-      { "SMIMECapability", "cms.SMIMECapability",
+      { "SMIMECapability", "cms.SMIMECapability_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_capability,
@@ -2254,11 +2254,11 @@ void proto_register_cms(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_parameters,
-      { "parameters", "cms.parameters",
+      { "parameters", "cms.parameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_recipientKeyId,
-      { "recipientKeyId", "cms.recipientKeyId",
+      { "recipientKeyId", "cms.recipientKeyId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RecipientKeyIdentifier", HFILL }},
     { &hf_cms_subjectAltKeyIdentifier,
@@ -2270,15 +2270,15 @@ void proto_register_cms(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_rc2CBCParameter,
-      { "rc2CBCParameter", "cms.rc2CBCParameter",
+      { "rc2CBCParameter", "cms.rc2CBCParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_acInfo,
-      { "acInfo", "cms.acInfo",
+      { "acInfo", "cms.acInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeCertificateInfoV1", HFILL }},
     { &hf_cms_signatureAlgorithm_v1,
-      { "signatureAlgorithm", "cms.signatureAlgorithm",
+      { "signatureAlgorithm", "cms.signatureAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_cms_signatureValue_v1,
@@ -2294,7 +2294,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, VALS(cms_T_subject_vals), 0,
         NULL, HFILL }},
     { &hf_cms_baseCertificateID,
-      { "baseCertificateID", "cms.baseCertificateID",
+      { "baseCertificateID", "cms.baseCertificateID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "IssuerSerial", HFILL }},
     { &hf_cms_subjectName,
@@ -2306,11 +2306,11 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralNames", HFILL }},
     { &hf_cms_signature_v1,
-      { "signature", "cms.signature",
+      { "signature", "cms.signature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_cms_attCertValidityPeriod,
-      { "attCertValidityPeriod", "cms.attCertValidityPeriod",
+      { "attCertValidityPeriod", "cms.attCertValidityPeriod_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_attributes_v1,
@@ -2318,7 +2318,7 @@ void proto_register_cms(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_Attribute", HFILL }},
     { &hf_cms_attributes_v1_item,
-      { "Attribute", "cms.Attribute",
+      { "Attribute", "cms.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_cms_issuerUniqueID,
index c89f0d3c6980ea56f17fc3abbd29931864818900..52ac249e5ecdefb9fff248816db93ad868fd8a7c 100644 (file)
@@ -407,11 +407,11 @@ void proto_register_credssp(void) {
 /*--- Included file: packet-credssp-hfarr.c ---*/
 #line 1 "../../asn1/credssp/packet-credssp-hfarr.c"
     { &hf_credssp_TSRequest_PDU,
-      { "TSRequest", "credssp.TSRequest",
+      { "TSRequest", "credssp.TSRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_credssp_NegoData_item,
-      { "NegoData item", "credssp.NegoData_item",
+      { "NegoData item", "credssp.NegoData_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_credssp_negoToken,
@@ -455,7 +455,7 @@ void proto_register_credssp(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_credssp_cspData,
-      { "cspData", "credssp.cspData",
+      { "cspData", "credssp.cspData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TSCspDataDetail", HFILL }},
     { &hf_credssp_userHint,
index cd70492258abda04265536af38a29c1ad26d5e0c..0c88a4a46b1cd500adde8fa1fffedf8b999b0929 100644 (file)
@@ -899,11 +899,11 @@ void proto_register_crmf(void) {
 /*--- Included file: packet-crmf-hfarr.c ---*/
 #line 1 "../../asn1/crmf/packet-crmf-hfarr.c"
     { &hf_crmf_CertRequest_PDU,
-      { "CertRequest", "crmf.CertRequest",
+      { "CertRequest", "crmf.CertRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_PBMParameter_PDU,
-      { "PBMParameter", "crmf.PBMParameter",
+      { "PBMParameter", "crmf.PBMParameter_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_RegToken_PDU,
@@ -915,7 +915,7 @@ void proto_register_crmf(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_PKIPublicationInfo_PDU,
-      { "PKIPublicationInfo", "crmf.PKIPublicationInfo",
+      { "PKIPublicationInfo", "crmf.PKIPublicationInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_PKIArchiveOptions_PDU,
@@ -923,11 +923,11 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, VALS(crmf_PKIArchiveOptions_vals), 0,
         NULL, HFILL }},
     { &hf_crmf_OldCertId_PDU,
-      { "OldCertId", "crmf.OldCertId",
+      { "OldCertId", "crmf.OldCertId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_ProtocolEncrKey_PDU,
-      { "ProtocolEncrKey", "crmf.ProtocolEncrKey",
+      { "ProtocolEncrKey", "crmf.ProtocolEncrKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_UTF8Pairs_PDU,
@@ -935,15 +935,15 @@ void proto_register_crmf(void) {
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_EncKeyWithID_PDU,
-      { "EncKeyWithID", "crmf.EncKeyWithID",
+      { "EncKeyWithID", "crmf.EncKeyWithID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_CertReqMessages_item,
-      { "CertReqMsg", "crmf.CertReqMsg",
+      { "CertReqMsg", "crmf.CertReqMsg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_certReq,
-      { "certReq", "crmf.certReq",
+      { "certReq", "crmf.certReq_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertRequest", HFILL }},
     { &hf_crmf_popo,
@@ -955,7 +955,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_AttributeTypeAndValue", HFILL }},
     { &hf_crmf_regInfo_item,
-      { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue",
+      { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_certReqId,
@@ -963,7 +963,7 @@ void proto_register_crmf(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_crmf_certTemplate,
-      { "certTemplate", "crmf.certTemplate",
+      { "certTemplate", "crmf.certTemplate_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_controls,
@@ -979,7 +979,7 @@ void proto_register_crmf(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_crmf_signingAlg,
-      { "signingAlg", "crmf.signingAlg",
+      { "signingAlg", "crmf.signingAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_template_issuer,
@@ -987,7 +987,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Name", HFILL }},
     { &hf_crmf_validity,
-      { "validity", "crmf.validity",
+      { "validity", "crmf.validity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "OptionalValidity", HFILL }},
     { &hf_crmf_subject,
@@ -995,7 +995,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "Name", HFILL }},
     { &hf_crmf_publicKey,
-      { "publicKey", "crmf.publicKey",
+      { "publicKey", "crmf.publicKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SubjectPublicKeyInfo", HFILL }},
     { &hf_crmf_issuerUID,
@@ -1019,7 +1019,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, VALS(pkix1explicit_Time_vals), 0,
         "Time", HFILL }},
     { &hf_crmf_Controls_item,
-      { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue",
+      { "AttributeTypeAndValue", "crmf.AttributeTypeAndValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_type,
@@ -1027,15 +1027,15 @@ void proto_register_crmf(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_value,
-      { "value", "crmf.value",
+      { "value", "crmf.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_raVerified,
-      { "raVerified", "crmf.raVerified",
+      { "raVerified", "crmf.raVerified_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_signature,
-      { "signature", "crmf.signature",
+      { "signature", "crmf.signature_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "POPOSigningKey", HFILL }},
     { &hf_crmf_keyEncipherment,
@@ -1047,11 +1047,11 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, VALS(crmf_POPOPrivKey_vals), 0,
         "POPOPrivKey", HFILL }},
     { &hf_crmf_poposkInput,
-      { "poposkInput", "crmf.poposkInput",
+      { "poposkInput", "crmf.poposkInput_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "POPOSigningKeyInput", HFILL }},
     { &hf_crmf_algorithmIdentifier,
-      { "algorithmIdentifier", "crmf.algorithmIdentifier",
+      { "algorithmIdentifier", "crmf.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_sk_signature,
@@ -1067,11 +1067,11 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralName", HFILL }},
     { &hf_crmf_publicKeyMAC,
-      { "publicKeyMAC", "crmf.publicKeyMAC",
+      { "publicKeyMAC", "crmf.publicKeyMAC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKMACValue", HFILL }},
     { &hf_crmf_algId,
-      { "algId", "crmf.algId",
+      { "algId", "crmf.algId_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_pkmac_value,
@@ -1083,7 +1083,7 @@ void proto_register_crmf(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_crmf_owf,
-      { "owf", "crmf.owf",
+      { "owf", "crmf.owf_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_iterationCount,
@@ -1091,7 +1091,7 @@ void proto_register_crmf(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_crmf_mac,
-      { "mac", "crmf.mac",
+      { "mac", "crmf.mac_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_thisMessage,
@@ -1107,11 +1107,11 @@ void proto_register_crmf(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_crmf_agreeMAC,
-      { "agreeMAC", "crmf.agreeMAC",
+      { "agreeMAC", "crmf.agreeMAC_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PKMACValue", HFILL }},
     { &hf_crmf_encryptedKey,
-      { "encryptedKey", "crmf.encryptedKey",
+      { "encryptedKey", "crmf.encryptedKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EnvelopedData", HFILL }},
     { &hf_crmf_action,
@@ -1123,7 +1123,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_SinglePubInfo", HFILL }},
     { &hf_crmf_pubInfos_item,
-      { "SinglePubInfo", "crmf.SinglePubInfo",
+      { "SinglePubInfo", "crmf.SinglePubInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_pubMethod,
@@ -1147,19 +1147,19 @@ void proto_register_crmf(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_crmf_encryptedValue,
-      { "encryptedValue", "crmf.encryptedValue",
+      { "encryptedValue", "crmf.encryptedValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_envelopedData,
-      { "envelopedData", "crmf.envelopedData",
+      { "envelopedData", "crmf.envelopedData_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_intendedAlg,
-      { "intendedAlg", "crmf.intendedAlg",
+      { "intendedAlg", "crmf.intendedAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_symmAlg,
-      { "symmAlg", "crmf.symmAlg",
+      { "symmAlg", "crmf.symmAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_encSymmKey,
@@ -1167,7 +1167,7 @@ void proto_register_crmf(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_crmf_keyAlg,
-      { "keyAlg", "crmf.keyAlg",
+      { "keyAlg", "crmf.keyAlg_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_valueHint,
@@ -1183,7 +1183,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "GeneralName", HFILL }},
     { &hf_crmf_enckeywid_privkey,
-      { "privateKey", "crmf.privateKey",
+      { "privateKey", "crmf.privateKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "PrivateKeyInfo", HFILL }},
     { &hf_crmf_identifier,
@@ -1203,7 +1203,7 @@ void proto_register_crmf(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_crmf_privateKeyAlgorithm,
-      { "privateKeyAlgorithm", "crmf.privateKeyAlgorithm",
+      { "privateKeyAlgorithm", "crmf.privateKeyAlgorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_crmf_privateKey,
@@ -1215,7 +1215,7 @@ void proto_register_crmf(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_crmf_Attributes_item,
-      { "Attribute", "crmf.Attribute",
+      { "Attribute", "crmf.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
 
index 4aebdbedea6606d3df515424219c726176e818fa..6ccb48dadba15b93af2cecad62f843e6c4fabf37 100644 (file)
@@ -4860,11 +4860,11 @@ void proto_register_dap(void) {
 /*--- Included file: packet-dap-hfarr.c ---*/
 #line 1 "../../asn1/dap/packet-dap-hfarr.c"
     { &hf_dap_DirectoryBindArgument_PDU,
-      { "DirectoryBindArgument", "dap.DirectoryBindArgument",
+      { "DirectoryBindArgument", "dap.DirectoryBindArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_DirectoryBindResult_PDU,
-      { "DirectoryBindResult", "dap.DirectoryBindResult",
+      { "DirectoryBindResult", "dap.DirectoryBindResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_DirectoryBindError_PDU,
@@ -4936,7 +4936,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ModifyEntryResult_vals), 0,
         NULL, HFILL }},
     { &hf_dap_ModifyDNArgument_PDU,
-      { "ModifyDNArgument", "dap.ModifyDNArgument",
+      { "ModifyDNArgument", "dap.ModifyDNArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_ModifyDNResult_PDU,
@@ -5000,7 +5000,7 @@ void proto_register_dap(void) {
         FT_INT32, BASE_DEC, NULL, 0,
         "INTEGER", HFILL }},
     { &hf_dap_manageDSAITPlaneRef,
-      { "manageDSAITPlaneRef", "dap.manageDSAITPlaneRef",
+      { "manageDSAITPlaneRef", "dap.manageDSAITPlaneRef_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_dsaName,
@@ -5008,7 +5008,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_dap_agreementID,
-      { "agreementID", "dap.agreementID",
+      { "agreementID", "dap.agreementID_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_serviceType,
@@ -5024,7 +5024,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_T_attributes_vals), 0,
         NULL, HFILL }},
     { &hf_dap_allUserAttributes,
-      { "allUserAttributes", "dap.allUserAttributes",
+      { "allUserAttributes", "dap.allUserAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_select,
@@ -5044,7 +5044,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_T_extraAttributes_vals), 0,
         NULL, HFILL }},
     { &hf_dap_allOperationalAttributes,
-      { "allOperationalAttributes", "dap.allOperationalAttributes",
+      { "allOperationalAttributes", "dap.allOperationalAttributes_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_extraSelect,
@@ -5064,11 +5064,11 @@ void proto_register_dap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dap_familyReturn,
-      { "familyReturn", "dap.familyReturn",
+      { "familyReturn", "dap.familyReturn_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_allContexts,
-      { "allContexts", "dap.allContexts",
+      { "allContexts", "dap.allContexts_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_selectedContexts,
@@ -5076,7 +5076,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_MAX_OF_TypeAndContextAssertion", HFILL }},
     { &hf_dap_selectedContexts_item,
-      { "TypeAndContextAssertion", "dap.TypeAndContextAssertion",
+      { "TypeAndContextAssertion", "dap.TypeAndContextAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_type,
@@ -5092,7 +5092,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_ContextAssertion", HFILL }},
     { &hf_dap_preference_item,
-      { "ContextAssertion", "dap.ContextAssertion",
+      { "ContextAssertion", "dap.ContextAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_all,
@@ -5100,7 +5100,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_ContextAssertion", HFILL }},
     { &hf_dap_all_item,
-      { "ContextAssertion", "dap.ContextAssertion",
+      { "ContextAssertion", "dap.ContextAssertion_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_memberSelect,
@@ -5136,7 +5136,7 @@ void proto_register_dap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_attribute,
-      { "attribute", "dap.attribute",
+      { "attribute", "dap.attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_incompleteEntry,
@@ -5160,7 +5160,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_OF_FamilyEntry", HFILL }},
     { &hf_dap_familyEntries_item,
-      { "FamilyEntry", "dap.FamilyEntry",
+      { "FamilyEntry", "dap.FamilyEntry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_rdn,
@@ -5180,7 +5180,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_FamilyEntries", HFILL }},
     { &hf_dap_family_info_item,
-      { "FamilyEntries", "dap.FamilyEntries",
+      { "FamilyEntries", "dap.FamilyEntries_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_filter_item,
@@ -5204,11 +5204,11 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_Filter_vals), 0,
         NULL, HFILL }},
     { &hf_dap_equality,
-      { "equality", "dap.equality",
+      { "equality", "dap.equality_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_dap_substrings,
-      { "substrings", "dap.substrings",
+      { "substrings", "dap.substrings_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_sunstringType,
@@ -5224,27 +5224,27 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_T_strings_item_vals), 0,
         NULL, HFILL }},
     { &hf_dap_initial,
-      { "initial", "dap.initial",
+      { "initial", "dap.initial_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_any,
-      { "any", "dap.any",
+      { "any", "dap.any_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_final,
-      { "final", "dap.final",
+      { "final", "dap.final_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_control,
-      { "control", "dap.control",
+      { "control", "dap.control_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Attribute", HFILL }},
     { &hf_dap_greaterOrEqual,
-      { "greaterOrEqual", "dap.greaterOrEqual",
+      { "greaterOrEqual", "dap.greaterOrEqual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_dap_lessOrEqual,
-      { "lessOrEqual", "dap.lessOrEqual",
+      { "lessOrEqual", "dap.lessOrEqual_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_dap_present,
@@ -5252,15 +5252,15 @@ void proto_register_dap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "AttributeType", HFILL }},
     { &hf_dap_approximateMatch,
-      { "approximateMatch", "dap.approximateMatch",
+      { "approximateMatch", "dap.approximateMatch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_dap_extensibleMatch,
-      { "extensibleMatch", "dap.extensibleMatch",
+      { "extensibleMatch", "dap.extensibleMatch_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "MatchingRuleAssertion", HFILL }},
     { &hf_dap_contextPresent,
-      { "contextPresent", "dap.contextPresent",
+      { "contextPresent", "dap.contextPresent_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeTypeAssertion", HFILL }},
     { &hf_dap_matchingRule,
@@ -5272,7 +5272,7 @@ void proto_register_dap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_dap_matchValue,
-      { "matchValue", "dap.matchValue",
+      { "matchValue", "dap.matchValue_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_dnAttributes,
@@ -5280,7 +5280,7 @@ void proto_register_dap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dap_newRequest,
-      { "newRequest", "dap.newRequest",
+      { "newRequest", "dap.newRequest_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_pageSize,
@@ -5292,7 +5292,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_SortKey", HFILL }},
     { &hf_dap_sortKeys_item,
-      { "SortKey", "dap.SortKey",
+      { "SortKey", "dap.SortKey_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_reverse,
@@ -5312,7 +5312,7 @@ void proto_register_dap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "OBJECT_IDENTIFIER", HFILL }},
     { &hf_dap_certification_path,
-      { "certification-path", "dap.certification_path",
+      { "certification-path", "dap.certification_path_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CertificationPath", HFILL }},
     { &hf_dap_distinguished_name,
@@ -5340,7 +5340,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(ros_Code_vals), 0,
         "Code", HFILL }},
     { &hf_dap_attributeCertificationPath,
-      { "attributeCertificationPath", "dap.attributeCertificationPath",
+      { "attributeCertificationPath", "dap.attributeCertificationPath_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_errorProtection,
@@ -5368,15 +5368,15 @@ void proto_register_dap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_simple,
-      { "simple", "dap.simple",
+      { "simple", "dap.simple_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SimpleCredentials", HFILL }},
     { &hf_dap_strong,
-      { "strong", "dap.strong",
+      { "strong", "dap.strong_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "StrongCredentials", HFILL }},
     { &hf_dap_externalProcedure,
-      { "externalProcedure", "dap.externalProcedure",
+      { "externalProcedure", "dap.externalProcedure_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EXTERNAL", HFILL }},
     { &hf_dap_spkm,
@@ -5384,11 +5384,11 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_SpkmCredentials_vals), 0,
         "SpkmCredentials", HFILL }},
     { &hf_dap_sasl,
-      { "sasl", "dap.sasl",
+      { "sasl", "dap.sasl_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SaslCredentials", HFILL }},
     { &hf_dap_validity,
-      { "validity", "dap.validity",
+      { "validity", "dap.validity_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_time1,
@@ -5424,7 +5424,7 @@ void proto_register_dap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_dap_protected,
-      { "protected", "dap.protected",
+      { "protected", "dap.protected_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_protectedPassword,
@@ -5432,7 +5432,7 @@ void proto_register_dap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "OCTET_STRING", HFILL }},
     { &hf_dap_algorithmIdentifier,
-      { "algorithmIdentifier", "dap.algorithmIdentifier",
+      { "algorithmIdentifier", "dap.algorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_encrypted,
@@ -5440,15 +5440,15 @@ void proto_register_dap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BIT_STRING", HFILL }},
     { &hf_dap_bind_token,
-      { "bind-token", "dap.bind_token",
+      { "bind-token", "dap.bind_token_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "Token", HFILL }},
     { &hf_dap_req,
-      { "req", "dap.req",
+      { "req", "dap.req_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_rep,
-      { "rep", "dap.rep",
+      { "rep", "dap.rep_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_mechanism,
@@ -5464,7 +5464,7 @@ void proto_register_dap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dap_algorithm,
-      { "algorithm", "dap.algorithm",
+      { "algorithm", "dap.algorithm_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_dap_utctime,
@@ -5476,7 +5476,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier", HFILL }},
     { &hf_dap_bindIntAlgorithm_item,
-      { "AlgorithmIdentifier", "dap.AlgorithmIdentifier",
+      { "AlgorithmIdentifier", "dap.AlgorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_bindIntKeyInfo,
@@ -5488,7 +5488,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_AlgorithmIdentifier", HFILL }},
     { &hf_dap_bindConfAlgorithm_item,
-      { "AlgorithmIdentifier", "dap.AlgorithmIdentifier",
+      { "AlgorithmIdentifier", "dap.AlgorithmIdentifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_bindConfKeyInfo,
@@ -5496,23 +5496,23 @@ void proto_register_dap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         "BindKeyInfo", HFILL }},
     { &hf_dap_token_data,
-      { "token-data", "dap.token_data",
+      { "token-data", "dap.token_data_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "TokenData", HFILL }},
     { &hf_dap_algorithm_identifier,
-      { "algorithm-identifier", "dap.algorithm_identifier",
+      { "algorithm-identifier", "dap.algorithm_identifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AlgorithmIdentifier", HFILL }},
     { &hf_dap_unsignedDirectoryBindError,
-      { "unsignedDirectoryBindError", "dap.unsignedDirectoryBindError",
+      { "unsignedDirectoryBindError", "dap.unsignedDirectoryBindError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DirectoryBindErrorData", HFILL }},
     { &hf_dap_signedDirectoryBindError,
-      { "signedDirectoryBindError", "dap.signedDirectoryBindError",
+      { "signedDirectoryBindError", "dap.signedDirectoryBindError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_directoryBindError,
-      { "directoryBindError", "dap.directoryBindError",
+      { "directoryBindError", "dap.directoryBindError_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "DirectoryBindErrorData", HFILL }},
     { &hf_dap_error,
@@ -5528,7 +5528,7 @@ void proto_register_dap(void) {
         FT_INT32, BASE_DEC, VALS(dap_SecurityProblem_vals), 0,
         "SecurityProblem", HFILL }},
     { &hf_dap_securityParameters,
-      { "securityParameters", "dap.securityParameters",
+      { "securityParameters", "dap.securityParameters_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_object,
@@ -5536,7 +5536,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(x509if_Name_vals), 0,
         "Name", HFILL }},
     { &hf_dap_selection,
-      { "selection", "dap.selection",
+      { "selection", "dap.selection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EntryInformationSelection", HFILL }},
     { &hf_dap_modifyRightsRequest,
@@ -5544,7 +5544,7 @@ void proto_register_dap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dap_serviceControls,
-      { "serviceControls", "dap.serviceControls",
+      { "serviceControls", "dap.serviceControls_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_requestor,
@@ -5552,7 +5552,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "DistinguishedName", HFILL }},
     { &hf_dap_operationProgress,
-      { "operationProgress", "dap.operationProgress",
+      { "operationProgress", "dap.operationProgress_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_aliasedRDNs,
@@ -5592,19 +5592,19 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_unsignedReadArgument,
-      { "unsignedReadArgument", "dap.unsignedReadArgument",
+      { "unsignedReadArgument", "dap.unsignedReadArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReadArgumentData", HFILL }},
     { &hf_dap_signedReadArgument,
-      { "signedReadArgument", "dap.signedReadArgument",
+      { "signedReadArgument", "dap.signedReadArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_readArgument,
-      { "readArgument", "dap.readArgument",
+      { "readArgument", "dap.readArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReadArgumentData", HFILL }},
     { &hf_dap_entry,
-      { "entry", "dap.entry",
+      { "entry", "dap.entry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EntryInformation", HFILL }},
     { &hf_dap_modifyRights,
@@ -5624,23 +5624,23 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_Attribute", HFILL }},
     { &hf_dap_notification_item,
-      { "Attribute", "dap.Attribute",
+      { "Attribute", "dap.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_unsignedReadResult,
-      { "unsignedReadResult", "dap.unsignedReadResult",
+      { "unsignedReadResult", "dap.unsignedReadResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReadResultData", HFILL }},
     { &hf_dap_signedReadResult,
-      { "signedReadResult", "dap.signedReadResult",
+      { "signedReadResult", "dap.signedReadResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_readResult,
-      { "readResult", "dap.readResult",
+      { "readResult", "dap.readResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ReadResultData", HFILL }},
     { &hf_dap_ModifyRights_item,
-      { "ModifyRights item", "dap.ModifyRights_item",
+      { "ModifyRights item", "dap.ModifyRights_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_item,
@@ -5648,7 +5648,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_T_item_vals), 0,
         NULL, HFILL }},
     { &hf_dap_item_entry,
-      { "entry", "dap.entry",
+      { "entry", "dap.entry_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_attribute_type,
@@ -5656,7 +5656,7 @@ void proto_register_dap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "AttributeType", HFILL }},
     { &hf_dap_value_assertion,
-      { "value", "dap.value",
+      { "value", "dap.value_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_dap_permission,
@@ -5664,19 +5664,19 @@ void proto_register_dap(void) {
         FT_BYTES, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_purported,
-      { "purported", "dap.purported",
+      { "purported", "dap.purported_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AttributeValueAssertion", HFILL }},
     { &hf_dap_unsignedCompareArgument,
-      { "unsignedCompareArgument", "dap.unsignedCompareArgument",
+      { "unsignedCompareArgument", "dap.unsignedCompareArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompareArgumentData", HFILL }},
     { &hf_dap_signedCompareArgument,
-      { "signedCompareArgument", "dap.signedCompareArgument",
+      { "signedCompareArgument", "dap.signedCompareArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_compareArgument,
-      { "compareArgument", "dap.compareArgument",
+      { "compareArgument", "dap.compareArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompareArgumentData", HFILL }},
     { &hf_dap_matched,
@@ -5688,15 +5688,15 @@ void proto_register_dap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         "AttributeType", HFILL }},
     { &hf_dap_unsignedCompareResult,
-      { "unsignedCompareResult", "dap.unsignedCompareResult",
+      { "unsignedCompareResult", "dap.unsignedCompareResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompareResultData", HFILL }},
     { &hf_dap_signedCompareResult,
-      { "signedCompareResult", "dap.signedCompareResult",
+      { "signedCompareResult", "dap.signedCompareResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_compareResult,
-      { "compareResult", "dap.compareResult",
+      { "compareResult", "dap.compareResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "CompareResultData", HFILL }},
     { &hf_dap_invokeID,
@@ -5704,19 +5704,19 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(ros_InvokeId_vals), 0,
         NULL, HFILL }},
     { &hf_dap_unsignedAbandonArgument,
-      { "unsignedAbandonArgument", "dap.unsignedAbandonArgument",
+      { "unsignedAbandonArgument", "dap.unsignedAbandonArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AbandonArgumentData", HFILL }},
     { &hf_dap_signedAbandonArgument,
-      { "signedAbandonArgument", "dap.signedAbandonArgument",
+      { "signedAbandonArgument", "dap.signedAbandonArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_abandonArgument,
-      { "abandonArgument", "dap.abandonArgument",
+      { "abandonArgument", "dap.abandonArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AbandonArgumentData", HFILL }},
     { &hf_dap_null,
-      { "null", "dap.null",
+      { "null", "dap.null_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_abandon_information,
@@ -5724,15 +5724,15 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_AbandonInformation_vals), 0,
         "AbandonInformation", HFILL }},
     { &hf_dap_unsignedAbandonResult,
-      { "unsignedAbandonResult", "dap.unsignedAbandonResult",
+      { "unsignedAbandonResult", "dap.unsignedAbandonResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AbandonResultData", HFILL }},
     { &hf_dap_signedAbandonResult,
-      { "signedAbandonResult", "dap.signedAbandonResult",
+      { "signedAbandonResult", "dap.signedAbandonResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_abandonResult,
-      { "abandonResult", "dap.abandonResult",
+      { "abandonResult", "dap.abandonResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AbandonResultData", HFILL }},
     { &hf_dap_pagedResults,
@@ -5744,19 +5744,19 @@ void proto_register_dap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dap_unsignedListArgument,
-      { "unsignedListArgument", "dap.unsignedListArgument",
+      { "unsignedListArgument", "dap.unsignedListArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ListArgumentData", HFILL }},
     { &hf_dap_signedListArgument,
-      { "signedListArgument", "dap.signedListArgument",
+      { "signedListArgument", "dap.signedListArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_listArgument,
-      { "listArgument", "dap.listArgument",
+      { "listArgument", "dap.listArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ListArgumentData", HFILL }},
     { &hf_dap_listInfo,
-      { "listInfo", "dap.listInfo",
+      { "listInfo", "dap.listInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_subordinates,
@@ -5764,7 +5764,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_subordinates_item,
-      { "subordinates item", "dap.subordinates_item",
+      { "subordinates item", "dap.subordinates_item_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_aliasEntry,
@@ -5772,7 +5772,7 @@ void proto_register_dap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dap_partialOutcomeQualifier,
-      { "partialOutcomeQualifier", "dap.partialOutcomeQualifier",
+      { "partialOutcomeQualifier", "dap.partialOutcomeQualifier_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_uncorrelatedListInfo,
@@ -5788,7 +5788,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_ListResultData_vals), 0,
         "ListResultData", HFILL }},
     { &hf_dap_signedListResult,
-      { "signedListResult", "dap.signedListResult",
+      { "signedListResult", "dap.signedListResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_listResult,
@@ -5804,7 +5804,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_SIZE_1_MAX_OF_ContinuationReference", HFILL }},
     { &hf_dap_unexplored_item,
-      { "ContinuationReference", "dap.ContinuationReference",
+      { "ContinuationReference", "dap.ContinuationReference_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_unavailableCriticalExtensions,
@@ -5876,7 +5876,7 @@ void proto_register_dap(void) {
         FT_BOOLEAN, BASE_NONE, NULL, 0,
         "BOOLEAN", HFILL }},
     { &hf_dap_relaxation,
-      { "relaxation", "dap.relaxation",
+      { "relaxation", "dap.relaxation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RelaxationPolicy", HFILL }},
     { &hf_dap_extendedArea,
@@ -5896,7 +5896,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_JoinArgument", HFILL }},
     { &hf_dap_joinArguments_item,
-      { "JoinArgument", "dap.JoinArgument",
+      { "JoinArgument", "dap.JoinArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_joinType,
@@ -5904,15 +5904,15 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_T_joinType_vals), 0,
         NULL, HFILL }},
     { &hf_dap_unsignedSearchArgument,
-      { "unsignedSearchArgument", "dap.unsignedSearchArgument",
+      { "unsignedSearchArgument", "dap.unsignedSearchArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SearchArgumentData", HFILL }},
     { &hf_dap_signedSearchArgument,
-      { "signedSearchArgument", "dap.signedSearchArgument",
+      { "signedSearchArgument", "dap.signedSearchArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_searchArgument,
-      { "searchArgument", "dap.searchArgument",
+      { "searchArgument", "dap.searchArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "SearchArgumentData", HFILL }},
     { &hf_dap_joinBaseObject,
@@ -5936,11 +5936,11 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SEQUENCE_SIZE_1_MAX_OF_JoinAttPair", HFILL }},
     { &hf_dap_joinAttributes_item,
-      { "JoinAttPair", "dap.JoinAttPair",
+      { "JoinAttPair", "dap.JoinAttPair_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_joinSelection,
-      { "joinSelection", "dap.joinSelection",
+      { "joinSelection", "dap.joinSelection_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "EntryInformationSelection", HFILL }},
     { &hf_dap_baseAtt,
@@ -5960,7 +5960,7 @@ void proto_register_dap(void) {
         FT_OID, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_searchInfo,
-      { "searchInfo", "dap.searchInfo",
+      { "searchInfo", "dap.searchInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_entries,
@@ -5968,7 +5968,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_EntryInformation", HFILL }},
     { &hf_dap_entries_item,
-      { "EntryInformation", "dap.EntryInformation",
+      { "EntryInformation", "dap.EntryInformation_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_altMatching,
@@ -5988,7 +5988,7 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_SearchResultData_vals), 0,
         "SearchResultData", HFILL }},
     { &hf_dap_signedSearchResult,
-      { "signedSearchResult", "dap.signedSearchResult",
+      { "signedSearchResult", "dap.signedSearchResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_searchResult,
@@ -6000,23 +6000,23 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, NULL, 0,
         "SET_OF_Attribute", HFILL }},
     { &hf_dap_add_entry_item,
-      { "Attribute", "dap.Attribute",
+      { "Attribute", "dap.Attribute_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_targetSystem,
-      { "targetSystem", "dap.targetSystem",
+      { "targetSystem", "dap.targetSystem_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AccessPoint", HFILL }},
     { &hf_dap_unsignedAddEntryArgument,
-      { "unsignedAddEntryArgument", "dap.unsignedAddEntryArgument",
+      { "unsignedAddEntryArgument", "dap.unsignedAddEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddEntryArgumentData", HFILL }},
     { &hf_dap_signedAddEntryArgument,
-      { "signedAddEntryArgument", "dap.signedAddEntryArgument",
+      { "signedAddEntryArgument", "dap.signedAddEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_addEntryArgument,
-      { "addEntryArgument", "dap.addEntryArgument",
+      { "addEntryArgument", "dap.addEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddEntryArgumentData", HFILL }},
     { &hf_dap_add_entry_information,
@@ -6024,27 +6024,27 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_AddEntryInformation_vals), 0,
         "AddEntryInformation", HFILL }},
     { &hf_dap_unsignedAddEntryResult,
-      { "unsignedAddEntryResult", "dap.unsignedAddEntryResult",
+      { "unsignedAddEntryResult", "dap.unsignedAddEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddEntryResultData", HFILL }},
     { &hf_dap_signedAddEntryResult,
-      { "signedAddEntryResult", "dap.signedAddEntryResult",
+      { "signedAddEntryResult", "dap.signedAddEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_addEntryResult,
-      { "addEntryResult", "dap.addEntryResult",
+      { "addEntryResult", "dap.addEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "AddEntryResultData", HFILL }},
     { &hf_dap_unsignedRemoveEntryArgument,
-      { "unsignedRemoveEntryArgument", "dap.unsignedRemoveEntryArgument",
+      { "unsignedRemoveEntryArgument", "dap.unsignedRemoveEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RemoveEntryArgumentData", HFILL }},
     { &hf_dap_signedRemoveEntryArgument,
-      { "signedRemoveEntryArgument", "dap.signedRemoveEntryArgument",
+      { "signedRemoveEntryArgument", "dap.signedRemoveEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_removeEntryArgument,
-      { "removeEntryArgument", "dap.removeEntryArgument",
+      { "removeEntryArgument", "dap.removeEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RemoveEntryArgumentData", HFILL }},
     { &hf_dap_remove_entry_information,
@@ -6052,15 +6052,15 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_RemoveEntryInformation_vals), 0,
         "RemoveEntryInformation", HFILL }},
     { &hf_dap_unsignedRemoveEntryResult,
-      { "unsignedRemoveEntryResult", "dap.unsignedRemoveEntryResult",
+      { "unsignedRemoveEntryResult", "dap.unsignedRemoveEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RemoveEntryResultData", HFILL }},
     { &hf_dap_signedRemoveEntryResult,
-      { "signedRemoveEntryResult", "dap.signedRemoveEntryResult",
+      { "signedRemoveEntryResult", "dap.signedRemoveEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_removeEntryResult,
-      { "removeEntryResult", "dap.removeEntryResult",
+      { "removeEntryResult", "dap.removeEntryResult_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "RemoveEntryResultData", HFILL }},
     { &hf_dap_changes,
@@ -6072,15 +6072,15 @@ void proto_register_dap(void) {
         FT_UINT32, BASE_DEC, VALS(dap_EntryModification_vals), 0,
         NULL, HFILL }},
     { &hf_dap_unsignedModifyEntryArgument,
-      { "unsignedModifyEntryArgument", "dap.unsignedModifyEntryArgument",
+      { "unsignedModifyEntryArgument", "dap.unsignedModifyEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         "ModifyEntryArgumentData", HFILL }},
     { &hf_dap_signedModifyEntryArgument,
-      { "signedModifyEntryArgument", "dap.signedModifyEntryArgument",
+      { "signedModifyEntryArgument", "dap.signedModifyEntryArgument_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_dap_modifyEntryArgument,
-&nb