Postfix FT_NONE fields with "_element" string to reduce number of incompatible filters in ASN.1 dissectors

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2402

svn path=/trunk/; revision=49599

1 files changed, 89 insertions, 89 deletions

diff --git a/epan/dissectors/packet-HI2Operations.c b/epan/dissectors/packet-HI2Operations.c
index 55a74dde7b..b1eefb6c4d 100644
--- a/epan/dissectors/packet-HI2Operations.c
+++ b/epan/dissectors/packet-HI2Operations.c
@@ -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,